Implement Enum handling and study hierarchy handling

147 files changed, 1821 insertions, 780 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java
index 323e4df4..d3d4b54d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ide;

 

@@ -15,6 +15,9 @@ import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper;
 import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper;

 import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;

 import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;

+import org.eclipse.xtext.ide.refactoring.IRenameStrategy2;

+import org.eclipse.xtext.ide.server.rename.IRenameService;

+import org.eclipse.xtext.ide.server.rename.RenameService;

 

 /**

  * Manual modifications go to {@link VampireLanguageIdeModule}.

@@ -44,4 +47,14 @@ public abstract class AbstractVampireLanguageIdeModule extends DefaultIdeModule
                 return FQNPrefixMatcher.class;

         }

         

+        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

+        public Class<? extends IRenameService> bindIRenameService() {

+                return RenameService.class;

+        }

+        

+        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

+        public Class<? extends IRenameStrategy2> bindIRenameStrategy2() {

+                return IRenameStrategy2.DefaultImpl.class;

+        }

+        

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java
index 67ea9dca..3e7d7281 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr;

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
index 9004026e..8f952c29 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
@@ -1,22 +1,160 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr;

 

 import ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr.internal.InternalVampireLanguageParser;

 import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess;

+import com.google.common.collect.ImmutableMap;

 import com.google.inject.Inject;

-import java.util.HashMap;

+import com.google.inject.Singleton;

 import java.util.Map;

 import org.eclipse.xtext.AbstractElement;

 import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractContentAssistParser;

 

 public class VampireLanguageParser extends AbstractContentAssistParser {

 

+        @Singleton

+        public static final class NameMappings {

+                

+                private final Map<AbstractElement, String> mappings;

+                

+                @Inject

+                public NameMappings(VampireLanguageGrammarAccess grammarAccess) {

+                        ImmutableMap.Builder<AbstractElement, String> builder = ImmutableMap.builder();

+                        init(builder, grammarAccess);

+                        this.mappings = builder.build();

+                }

+                

+                public String getRuleName(AbstractElement element) {

+                        return mappings.get(element);

+                }

+                

+                private static void init(ImmutableMap.Builder<AbstractElement, String> builder, VampireLanguageGrammarAccess grammarAccess) {

+                        builder.put(grammarAccess.getVampireModelAccess().getAlternatives(), "rule__VampireModel__Alternatives");

+                        builder.put(grammarAccess.getVLSNameAccess().getNameAlternatives_0(), "rule__VLSName__NameAlternatives_0");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getNameAlternatives_2_0(), "rule__VLSFofFormula__NameAlternatives_2_0");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getNameAlternatives_2_0(), "rule__VLSTffFormula__NameAlternatives_2_0");

+                        builder.put(grammarAccess.getVLSRoleAccess().getAlternatives(), "rule__VLSRole__Alternatives");

+                        builder.put(grammarAccess.getVLSAnnotationAccess().getNameAlternatives_1_0(), "rule__VLSAnnotation__NameAlternatives_1_0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getAlternatives_1(), "rule__VLSBinary__Alternatives_1");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getAlternatives_1_0_0(), "rule__VLSBinary__Alternatives_1_0_0");

+                        builder.put(grammarAccess.getVLSUnitaryFormulaAccess().getAlternatives(), "rule__VLSUnitaryFormula__Alternatives");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getAlternatives_1_0(), "rule__VLSUnaryInfix__Alternatives_1_0");

+                        builder.put(grammarAccess.getVLSAtomicAccess().getAlternatives(), "rule__VLSAtomic__Alternatives");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getAlternatives(), "rule__VLSAtomicConstant__Alternatives");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getNameAlternatives_0_1_0(), "rule__VLSAtomicConstant__NameAlternatives_0_1_0");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getAlternatives(), "rule__VLSAtomicFunction__Alternatives");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAlternatives_0_1_0(), "rule__VLSAtomicFunction__ConstantAlternatives_0_1_0");

+                        builder.put(grammarAccess.getVLSFofTermAccess().getAlternatives(), "rule__VLSFofTerm__Alternatives");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0(), "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getAlternatives(), "rule__VLSDefinedTerm__Alternatives");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getGroup(), "rule__VLSInclude__Group__0");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getGroup_2(), "rule__VLSInclude__Group_2__0");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getGroup_2_2(), "rule__VLSInclude__Group_2_2__0");

+                        builder.put(grammarAccess.getVLSCommentAccess().getGroup(), "rule__VLSComment__Group__0");

+                        builder.put(grammarAccess.getVLSSatisfiableAccess().getGroup(), "rule__VLSSatisfiable__Group__0");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getGroup(), "rule__VLSFofFormula__Group__0");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getGroup_7(), "rule__VLSFofFormula__Group_7__0");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getGroup(), "rule__VLSTffFormula__Group__0");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getGroup_7(), "rule__VLSTffFormula__Group_7__0");

+                        builder.put(grammarAccess.getVLSAnnotationAccess().getGroup(), "rule__VLSAnnotation__Group__0");

+                        builder.put(grammarAccess.getVLSAnnotationAccess().getGroup_2(), "rule__VLSAnnotation__Group_2__0");

+                        builder.put(grammarAccess.getVLSAnnotationTermsAccess().getGroup(), "rule__VLSAnnotationTerms__Group__0");

+                        builder.put(grammarAccess.getVLSAnnotationTermsAccess().getGroup_1(), "rule__VLSAnnotationTerms__Group_1__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup(), "rule__VLSBinary__Group__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0(), "rule__VLSBinary__Group_1_0__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_0(), "rule__VLSBinary__Group_1_0_0_0__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_1(), "rule__VLSBinary__Group_1_0_0_1__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_2(), "rule__VLSBinary__Group_1_0_0_2__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_3(), "rule__VLSBinary__Group_1_0_0_3__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_4(), "rule__VLSBinary__Group_1_0_0_4__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_5(), "rule__VLSBinary__Group_1_0_0_5__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_1(), "rule__VLSBinary__Group_1_1__0");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_2(), "rule__VLSBinary__Group_1_2__0");

+                        builder.put(grammarAccess.getVLSUnitaryFormulaAccess().getGroup_4(), "rule__VLSUnitaryFormula__Group_4__0");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup(), "rule__VLSUniversalQuantifier__Group__0");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1(), "rule__VLSUniversalQuantifier__Group_1__0");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1_3(), "rule__VLSUniversalQuantifier__Group_1_3__0");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup(), "rule__VLSExistentialQuantifier__Group__0");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1(), "rule__VLSExistentialQuantifier__Group_1__0");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1_3(), "rule__VLSExistentialQuantifier__Group_1_3__0");

+                        builder.put(grammarAccess.getVLSUnaryNegationAccess().getGroup(), "rule__VLSUnaryNegation__Group__0");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup(), "rule__VLSUnaryInfix__Group__0");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1(), "rule__VLSUnaryInfix__Group_1__0");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_0(), "rule__VLSUnaryInfix__Group_1_0_0__0");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_1(), "rule__VLSUnaryInfix__Group_1_0_1__0");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_2(), "rule__VLSUnaryInfix__Group_1_0_2__0");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_0(), "rule__VLSAtomicConstant__Group_0__0");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_1(), "rule__VLSAtomicConstant__Group_1__0");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_2(), "rule__VLSAtomicConstant__Group_2__0");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0(), "rule__VLSAtomicFunction__Group_0__0");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2(), "rule__VLSAtomicFunction__Group_0_2__0");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2_2(), "rule__VLSAtomicFunction__Group_0_2_2__0");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_1(), "rule__VLSAtomicFunction__Group_1__0");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup(), "rule__VLSFunctionAsTerm__Group__0");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1(), "rule__VLSFunctionAsTerm__Group_1__0");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2(), "rule__VLSFunctionAsTerm__Group_1_2__0");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_0(), "rule__VLSDefinedTerm__Group_0__0");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_1(), "rule__VLSDefinedTerm__Group_1__0");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_2(), "rule__VLSDefinedTerm__Group_2__0");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_3(), "rule__VLSDefinedTerm__Group_3__0");

+                        builder.put(grammarAccess.getVampireModelAccess().getIncludesAssignment_0(), "rule__VampireModel__IncludesAssignment_0");

+                        builder.put(grammarAccess.getVampireModelAccess().getCommentsAssignment_1(), "rule__VampireModel__CommentsAssignment_1");

+                        builder.put(grammarAccess.getVampireModelAccess().getConfirmationsAssignment_2(), "rule__VampireModel__ConfirmationsAssignment_2");

+                        builder.put(grammarAccess.getVampireModelAccess().getFormulasAssignment_3(), "rule__VampireModel__FormulasAssignment_3");

+                        builder.put(grammarAccess.getVampireModelAccess().getTfformulasAssignment_4(), "rule__VampireModel__TfformulasAssignment_4");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getFileNameAssignment_1(), "rule__VLSInclude__FileNameAssignment_1");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_1(), "rule__VLSInclude__NamesAssignment_2_1");

+                        builder.put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_2_1(), "rule__VLSInclude__NamesAssignment_2_2_1");

+                        builder.put(grammarAccess.getVLSNameAccess().getNameAssignment(), "rule__VLSName__NameAssignment");

+                        builder.put(grammarAccess.getVLSCommentAccess().getCommentAssignment_1(), "rule__VLSComment__CommentAssignment_1");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getNameAssignment_2(), "rule__VLSFofFormula__NameAssignment_2");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getFofRoleAssignment_4(), "rule__VLSFofFormula__FofRoleAssignment_4");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSFofFormula__FofFormulaAssignment_6");

+                        builder.put(grammarAccess.getVLSFofFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSFofFormula__AnnotationsAssignment_7_1");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getNameAssignment_2(), "rule__VLSTffFormula__NameAssignment_2");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getFofRoleAssignment_4(), "rule__VLSTffFormula__FofRoleAssignment_4");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSTffFormula__FofFormulaAssignment_6");

+                        builder.put(grammarAccess.getVLSTffFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSTffFormula__AnnotationsAssignment_7_1");

+                        builder.put(grammarAccess.getVLSAnnotationAccess().getNameAssignment_1(), "rule__VLSAnnotation__NameAssignment_1");

+                        builder.put(grammarAccess.getVLSAnnotationAccess().getFollowupAssignment_2_1(), "rule__VLSAnnotation__FollowupAssignment_2_1");

+                        builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_0(), "rule__VLSAnnotationTerms__TermsAssignment_0");

+                        builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_1_1(), "rule__VLSAnnotationTerms__TermsAssignment_1_1");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_0_1(), "rule__VLSBinary__RightAssignment_1_0_1");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_1_2(), "rule__VLSBinary__RightAssignment_1_1_2");

+                        builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_2_2(), "rule__VLSBinary__RightAssignment_1_2_2");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_2");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1");

+                        builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getOperandAssignment_2(), "rule__VLSUniversalQuantifier__OperandAssignment_2");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_2");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1");

+                        builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getOperandAssignment_2(), "rule__VLSExistentialQuantifier__OperandAssignment_2");

+                        builder.put(grammarAccess.getVLSUnaryNegationAccess().getOperandAssignment_2(), "rule__VLSUnaryNegation__OperandAssignment_2");

+                        builder.put(grammarAccess.getVLSUnaryInfixAccess().getRightAssignment_1_1(), "rule__VLSUnaryInfix__RightAssignment_1_1");

+                        builder.put(grammarAccess.getVLSAtomicConstantAccess().getNameAssignment_0_1(), "rule__VLSAtomicConstant__NameAssignment_0_1");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAssignment_0_1(), "rule__VLSAtomicFunction__ConstantAssignment_0_1");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_1");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_2_1");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getNameAssignment_1_1(), "rule__VLSAtomicFunction__NameAssignment_1_1");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_3(), "rule__VLSAtomicFunction__TermsAssignment_1_3");

+                        builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_5(), "rule__VLSAtomicFunction__TermsAssignment_1_5");

+                        builder.put(grammarAccess.getVLSVariableAccess().getNameAssignment(), "rule__VLSVariable__NameAssignment");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0(), "rule__VLSFunctionAsTerm__FunctorAssignment_0");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1(), "rule__VLSFunctionAsTerm__TermsAssignment_1_1");

+                        builder.put(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1(), "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_0_1(), "rule__VLSDefinedTerm__ValueAssignment_0_1");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_1_1(), "rule__VLSDefinedTerm__ValueAssignment_1_1");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_2_1(), "rule__VLSDefinedTerm__ValueAssignment_2_1");

+                        builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_3_1(), "rule__VLSDefinedTerm__ValueAssignment_3_1");

+                }

+        }

+        

         @Inject

-        private VampireLanguageGrammarAccess grammarAccess;

+        private NameMappings nameMappings;

 

-        private Map<AbstractElement, String> nameMappings;

+        @Inject

+        private VampireLanguageGrammarAccess grammarAccess;

 

         @Override

         protected InternalVampireLanguageParser createParser() {

@@ -27,132 +165,9 @@ public class VampireLanguageParser extends AbstractContentAssistParser {
 

         @Override

         protected String getRuleName(AbstractElement element) {

-                if (nameMappings == null) {

-                        nameMappings = new HashMap<AbstractElement, String>() {

-                                private static final long serialVersionUID = 1L;

-                                {

-                                        put(grammarAccess.getVampireModelAccess().getAlternatives(), "rule__VampireModel__Alternatives");

-                                        put(grammarAccess.getVLSNameAccess().getNameAlternatives_0(), "rule__VLSName__NameAlternatives_0");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getNameAlternatives_2_0(), "rule__VLSFofFormula__NameAlternatives_2_0");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getNameAlternatives_2_0(), "rule__VLSTffFormula__NameAlternatives_2_0");

-                                        put(grammarAccess.getVLSRoleAccess().getAlternatives(), "rule__VLSRole__Alternatives");

-                                        put(grammarAccess.getVLSAnnotationAccess().getNameAlternatives_1_0(), "rule__VLSAnnotation__NameAlternatives_1_0");

-                                        put(grammarAccess.getVLSBinaryAccess().getAlternatives_1(), "rule__VLSBinary__Alternatives_1");

-                                        put(grammarAccess.getVLSBinaryAccess().getAlternatives_1_0_0(), "rule__VLSBinary__Alternatives_1_0_0");

-                                        put(grammarAccess.getVLSUnitaryFormulaAccess().getAlternatives(), "rule__VLSUnitaryFormula__Alternatives");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getAlternatives_1_0(), "rule__VLSUnaryInfix__Alternatives_1_0");

-                                        put(grammarAccess.getVLSAtomicAccess().getAlternatives(), "rule__VLSAtomic__Alternatives");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getAlternatives(), "rule__VLSAtomicConstant__Alternatives");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getNameAlternatives_0_1_0(), "rule__VLSAtomicConstant__NameAlternatives_0_1_0");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getAlternatives(), "rule__VLSAtomicFunction__Alternatives");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAlternatives_0_1_0(), "rule__VLSAtomicFunction__ConstantAlternatives_0_1_0");

-                                        put(grammarAccess.getVLSFofTermAccess().getAlternatives(), "rule__VLSFofTerm__Alternatives");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0(), "rule__VLSFunctionFof__FunctorAlternatives_0_0");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getAlternatives(), "rule__VLSDefinedTerm__Alternatives");

-                                        put(grammarAccess.getVLSIncludeAccess().getGroup(), "rule__VLSInclude__Group__0");

-                                        put(grammarAccess.getVLSIncludeAccess().getGroup_2(), "rule__VLSInclude__Group_2__0");

-                                        put(grammarAccess.getVLSIncludeAccess().getGroup_2_2(), "rule__VLSInclude__Group_2_2__0");

-                                        put(grammarAccess.getVLSCommentAccess().getGroup(), "rule__VLSComment__Group__0");

-                                        put(grammarAccess.getVLSSatisfiableAccess().getGroup(), "rule__VLSSatisfiable__Group__0");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getGroup(), "rule__VLSFofFormula__Group__0");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getGroup_7(), "rule__VLSFofFormula__Group_7__0");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getGroup(), "rule__VLSTffFormula__Group__0");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getGroup_7(), "rule__VLSTffFormula__Group_7__0");

-                                        put(grammarAccess.getVLSAnnotationAccess().getGroup(), "rule__VLSAnnotation__Group__0");

-                                        put(grammarAccess.getVLSAnnotationAccess().getGroup_2(), "rule__VLSAnnotation__Group_2__0");

-                                        put(grammarAccess.getVLSAnnotationTermsAccess().getGroup(), "rule__VLSAnnotationTerms__Group__0");

-                                        put(grammarAccess.getVLSAnnotationTermsAccess().getGroup_1(), "rule__VLSAnnotationTerms__Group_1__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup(), "rule__VLSBinary__Group__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0(), "rule__VLSBinary__Group_1_0__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_0(), "rule__VLSBinary__Group_1_0_0_0__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_1(), "rule__VLSBinary__Group_1_0_0_1__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_2(), "rule__VLSBinary__Group_1_0_0_2__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_3(), "rule__VLSBinary__Group_1_0_0_3__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_4(), "rule__VLSBinary__Group_1_0_0_4__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_5(), "rule__VLSBinary__Group_1_0_0_5__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_1(), "rule__VLSBinary__Group_1_1__0");

-                                        put(grammarAccess.getVLSBinaryAccess().getGroup_1_2(), "rule__VLSBinary__Group_1_2__0");

-                                        put(grammarAccess.getVLSUnitaryFormulaAccess().getGroup_4(), "rule__VLSUnitaryFormula__Group_4__0");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup(), "rule__VLSUniversalQuantifier__Group__0");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1(), "rule__VLSUniversalQuantifier__Group_1__0");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1_3(), "rule__VLSUniversalQuantifier__Group_1_3__0");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup(), "rule__VLSExistentialQuantifier__Group__0");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1(), "rule__VLSExistentialQuantifier__Group_1__0");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1_3(), "rule__VLSExistentialQuantifier__Group_1_3__0");

-                                        put(grammarAccess.getVLSUnaryNegationAccess().getGroup(), "rule__VLSUnaryNegation__Group__0");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getGroup(), "rule__VLSUnaryInfix__Group__0");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1(), "rule__VLSUnaryInfix__Group_1__0");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_0(), "rule__VLSUnaryInfix__Group_1_0_0__0");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_1(), "rule__VLSUnaryInfix__Group_1_0_1__0");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_2(), "rule__VLSUnaryInfix__Group_1_0_2__0");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getGroup_0(), "rule__VLSAtomicConstant__Group_0__0");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getGroup_1(), "rule__VLSAtomicConstant__Group_1__0");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getGroup_2(), "rule__VLSAtomicConstant__Group_2__0");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0(), "rule__VLSAtomicFunction__Group_0__0");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2(), "rule__VLSAtomicFunction__Group_0_2__0");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2_2(), "rule__VLSAtomicFunction__Group_0_2_2__0");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_1(), "rule__VLSAtomicFunction__Group_1__0");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getGroup(), "rule__VLSFunctionFof__Group__0");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getGroup_1(), "rule__VLSFunctionFof__Group_1__0");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2(), "rule__VLSFunctionFof__Group_1_2__0");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getGroup_0(), "rule__VLSDefinedTerm__Group_0__0");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getGroup_1(), "rule__VLSDefinedTerm__Group_1__0");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getGroup_2(), "rule__VLSDefinedTerm__Group_2__0");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getGroup_3(), "rule__VLSDefinedTerm__Group_3__0");

-                                        put(grammarAccess.getVampireModelAccess().getIncludesAssignment_0(), "rule__VampireModel__IncludesAssignment_0");

-                                        put(grammarAccess.getVampireModelAccess().getCommentsAssignment_1(), "rule__VampireModel__CommentsAssignment_1");

-                                        put(grammarAccess.getVampireModelAccess().getConfirmationsAssignment_2(), "rule__VampireModel__ConfirmationsAssignment_2");

-                                        put(grammarAccess.getVampireModelAccess().getFormulasAssignment_3(), "rule__VampireModel__FormulasAssignment_3");

-                                        put(grammarAccess.getVampireModelAccess().getTfformulasAssignment_4(), "rule__VampireModel__TfformulasAssignment_4");

-                                        put(grammarAccess.getVLSIncludeAccess().getFileNameAssignment_1(), "rule__VLSInclude__FileNameAssignment_1");

-                                        put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_1(), "rule__VLSInclude__NamesAssignment_2_1");

-                                        put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_2_1(), "rule__VLSInclude__NamesAssignment_2_2_1");

-                                        put(grammarAccess.getVLSNameAccess().getNameAssignment(), "rule__VLSName__NameAssignment");

-                                        put(grammarAccess.getVLSCommentAccess().getCommentAssignment_1(), "rule__VLSComment__CommentAssignment_1");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getNameAssignment_2(), "rule__VLSFofFormula__NameAssignment_2");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getFofRoleAssignment_4(), "rule__VLSFofFormula__FofRoleAssignment_4");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSFofFormula__FofFormulaAssignment_6");

-                                        put(grammarAccess.getVLSFofFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSFofFormula__AnnotationsAssignment_7_1");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getNameAssignment_2(), "rule__VLSTffFormula__NameAssignment_2");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getFofRoleAssignment_4(), "rule__VLSTffFormula__FofRoleAssignment_4");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSTffFormula__FofFormulaAssignment_6");

-                                        put(grammarAccess.getVLSTffFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSTffFormula__AnnotationsAssignment_7_1");

-                                        put(grammarAccess.getVLSAnnotationAccess().getNameAssignment_1(), "rule__VLSAnnotation__NameAssignment_1");

-                                        put(grammarAccess.getVLSAnnotationAccess().getFollowupAssignment_2_1(), "rule__VLSAnnotation__FollowupAssignment_2_1");

-                                        put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_0(), "rule__VLSAnnotationTerms__TermsAssignment_0");

-                                        put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_1_1(), "rule__VLSAnnotationTerms__TermsAssignment_1_1");

-                                        put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_0_1(), "rule__VLSBinary__RightAssignment_1_0_1");

-                                        put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_1_2(), "rule__VLSBinary__RightAssignment_1_1_2");

-                                        put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_2_2(), "rule__VLSBinary__RightAssignment_1_2_2");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_2");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1");

-                                        put(grammarAccess.getVLSUniversalQuantifierAccess().getOperandAssignment_2(), "rule__VLSUniversalQuantifier__OperandAssignment_2");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_2");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1");

-                                        put(grammarAccess.getVLSExistentialQuantifierAccess().getOperandAssignment_2(), "rule__VLSExistentialQuantifier__OperandAssignment_2");

-                                        put(grammarAccess.getVLSUnaryNegationAccess().getOperandAssignment_2(), "rule__VLSUnaryNegation__OperandAssignment_2");

-                                        put(grammarAccess.getVLSUnaryInfixAccess().getRightAssignment_1_1(), "rule__VLSUnaryInfix__RightAssignment_1_1");

-                                        put(grammarAccess.getVLSAtomicConstantAccess().getNameAssignment_0_1(), "rule__VLSAtomicConstant__NameAssignment_0_1");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAssignment_0_1(), "rule__VLSAtomicFunction__ConstantAssignment_0_1");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_1");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_2_1");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getNameAssignment_1_1(), "rule__VLSAtomicFunction__NameAssignment_1_1");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_3(), "rule__VLSAtomicFunction__TermsAssignment_1_3");

-                                        put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_5(), "rule__VLSAtomicFunction__TermsAssignment_1_5");

-                                        put(grammarAccess.getVLSVariableAccess().getNameAssignment(), "rule__VLSVariable__NameAssignment");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0(), "rule__VLSFunctionFof__FunctorAssignment_0");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1(), "rule__VLSFunctionFof__TermsAssignment_1_1");

-                                        put(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1(), "rule__VLSFunctionFof__TermsAssignment_1_2_1");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_0_1(), "rule__VLSDefinedTerm__ValueAssignment_0_1");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_1_1(), "rule__VLSDefinedTerm__ValueAssignment_1_1");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_2_1(), "rule__VLSDefinedTerm__ValueAssignment_2_1");

-                                        put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_3_1(), "rule__VLSDefinedTerm__ValueAssignment_3_1");

-                                }

-                        };

-                }

-                return nameMappings.get(element);

+                return nameMappings.getRuleName(element);

         }

-                        

+

         @Override

         protected String[] getInitialHiddenTokens() {

                 return new String[] { "RULE_WS" };

@@ -165,4 +180,12 @@ public class VampireLanguageParser extends AbstractContentAssistParser {
         public void setGrammarAccess(VampireLanguageGrammarAccess grammarAccess) {

                 this.grammarAccess = grammarAccess;

         }

+        

+        public NameMappings getNameMappings() {

+                return nameMappings;

+        }

+        

+        public void setNameMappings(NameMappings nameMappings) {

+                this.nameMappings = nameMappings;

+        }

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
index 24768ec3..c5f2bcd0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 grammar InternalVampireLanguage;

 

@@ -624,25 +624,25 @@ finally {
         restoreStackSize(stackSize);

 }

 

-// Entry rule entryRuleVLSFunctionFof

-entryRuleVLSFunctionFof

+// Entry rule entryRuleVLSFunctionAsTerm

+entryRuleVLSFunctionAsTerm

 :

-{ before(grammarAccess.getVLSFunctionFofRule()); }

-         ruleVLSFunctionFof

-{ after(grammarAccess.getVLSFunctionFofRule()); } 

+{ before(grammarAccess.getVLSFunctionAsTermRule()); }

+         ruleVLSFunctionAsTerm

+{ after(grammarAccess.getVLSFunctionAsTermRule()); } 

          EOF 

 ;

 

-// Rule VLSFunctionFof

-ruleVLSFunctionFof 

+// Rule VLSFunctionAsTerm

+ruleVLSFunctionAsTerm 

         @init {

                 int stackSize = keepStackSize();

         }

         :

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getGroup()); }

-                (rule__VLSFunctionFof__Group__0)

-                { after(grammarAccess.getVLSFunctionFofAccess().getGroup()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); }

+                (rule__VLSFunctionAsTerm__Group__0)

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); }

         )

 ;

 finally {

@@ -1249,9 +1249,9 @@ rule__VLSFofTerm__Alternatives
         )

         |

         (

-                { before(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); }

-                ruleVLSFunctionFof

-                { after(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); }

+                { before(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); }

+                ruleVLSFunctionAsTerm

+                { after(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); }

         )

         |

         (

@@ -1264,33 +1264,33 @@ finally {
         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__FunctorAlternatives_0_0

+rule__VLSFunctionAsTerm__FunctorAlternatives_0_0

         @init {

                 int stackSize = keepStackSize();

         }

 :

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); }

                 RULE_LOWER_WORD_ID

-                { after(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); }

         )

         |

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); }

                 RULE_SINGLE_QUOTE

-                { after(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); }

         )

         |

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); }

                 RULE_DOLLAR_ID

-                { after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); }

         )

         |

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); }

                 RULE_DOUBLE_DOLLAR_ID

-                { after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); }

         )

 ;

 finally {

@@ -4840,53 +4840,53 @@ finally {
 }

 

 

-rule__VLSFunctionFof__Group__0

+rule__VLSFunctionAsTerm__Group__0

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group__0__Impl

-        rule__VLSFunctionFof__Group__1

+        rule__VLSFunctionAsTerm__Group__0__Impl

+        rule__VLSFunctionAsTerm__Group__1

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group__0__Impl

+rule__VLSFunctionAsTerm__Group__0__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); }

-        (rule__VLSFunctionFof__FunctorAssignment_0)

-        { after(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); }

+        (rule__VLSFunctionAsTerm__FunctorAssignment_0)

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); }

 )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group__1

+rule__VLSFunctionAsTerm__Group__1

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group__1__Impl

+        rule__VLSFunctionAsTerm__Group__1__Impl

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group__1__Impl

+rule__VLSFunctionAsTerm__Group__1__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); }

-        (rule__VLSFunctionFof__Group_1__0)?

-        { after(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); }

+        (rule__VLSFunctionAsTerm__Group_1__0)?

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); }

 )

 ;

 finally {

@@ -4894,107 +4894,107 @@ finally {
 }

 

 

-rule__VLSFunctionFof__Group_1__0

+rule__VLSFunctionAsTerm__Group_1__0

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1__0__Impl

-        rule__VLSFunctionFof__Group_1__1

+        rule__VLSFunctionAsTerm__Group_1__0__Impl

+        rule__VLSFunctionAsTerm__Group_1__1

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__0__Impl

+rule__VLSFunctionAsTerm__Group_1__0__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); }

         '('

-        { after(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); }

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); }

 )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__1

+rule__VLSFunctionAsTerm__Group_1__1

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1__1__Impl

-        rule__VLSFunctionFof__Group_1__2

+        rule__VLSFunctionAsTerm__Group_1__1__Impl

+        rule__VLSFunctionAsTerm__Group_1__2

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__1__Impl

+rule__VLSFunctionAsTerm__Group_1__1__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); }

-        (rule__VLSFunctionFof__TermsAssignment_1_1)

-        { after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); }

+        (rule__VLSFunctionAsTerm__TermsAssignment_1_1)

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); }

 )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__2

+rule__VLSFunctionAsTerm__Group_1__2

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1__2__Impl

-        rule__VLSFunctionFof__Group_1__3

+        rule__VLSFunctionAsTerm__Group_1__2__Impl

+        rule__VLSFunctionAsTerm__Group_1__3

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__2__Impl

+rule__VLSFunctionAsTerm__Group_1__2__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); }

-        (rule__VLSFunctionFof__Group_1_2__0)*

-        { after(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); }

+        (rule__VLSFunctionAsTerm__Group_1_2__0)*

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); }

 )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__3

+rule__VLSFunctionAsTerm__Group_1__3

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1__3__Impl

+        rule__VLSFunctionAsTerm__Group_1__3__Impl

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1__3__Impl

+rule__VLSFunctionAsTerm__Group_1__3__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); }

         ')'

-        { after(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); }

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); }

 )

 ;

 finally {

@@ -5002,53 +5002,53 @@ finally {
 }

 

 

-rule__VLSFunctionFof__Group_1_2__0

+rule__VLSFunctionAsTerm__Group_1_2__0

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1_2__0__Impl

-        rule__VLSFunctionFof__Group_1_2__1

+        rule__VLSFunctionAsTerm__Group_1_2__0__Impl

+        rule__VLSFunctionAsTerm__Group_1_2__1

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1_2__0__Impl

+rule__VLSFunctionAsTerm__Group_1_2__0__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); }

         ','

-        { after(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); }

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); }

 )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1_2__1

+rule__VLSFunctionAsTerm__Group_1_2__1

         @init {

                 int stackSize = keepStackSize();

         }

 :

-        rule__VLSFunctionFof__Group_1_2__1__Impl

+        rule__VLSFunctionAsTerm__Group_1_2__1__Impl

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__Group_1_2__1__Impl

+rule__VLSFunctionAsTerm__Group_1_2__1__Impl

         @init {

                 int stackSize = keepStackSize();

         }

 :

 (

-        { before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); }

-        (rule__VLSFunctionFof__TermsAssignment_1_2_1)

-        { after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); }

+        { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); }

+        (rule__VLSFunctionAsTerm__TermsAssignment_1_2_1)

+        { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); }

 )

 ;

 finally {

@@ -5891,45 +5891,45 @@ finally {
         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__FunctorAssignment_0

+rule__VLSFunctionAsTerm__FunctorAssignment_0

         @init {

                 int stackSize = keepStackSize();

         }

 :

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); }

-                (rule__VLSFunctionFof__FunctorAlternatives_0_0)

-                { after(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); }

+                (rule__VLSFunctionAsTerm__FunctorAlternatives_0_0)

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); }

         )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__TermsAssignment_1_1

+rule__VLSFunctionAsTerm__TermsAssignment_1_1

         @init {

                 int stackSize = keepStackSize();

         }

 :

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); }

                 ruleVLSFofTerm

-                { after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); }

         )

 ;

 finally {

         restoreStackSize(stackSize);

 }

 

-rule__VLSFunctionFof__TermsAssignment_1_2_1

+rule__VLSFunctionAsTerm__TermsAssignment_1_2_1

         @init {

                 int stackSize = keepStackSize();

         }

 :

         (

-                { before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); }

+                { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); }

                 ruleVLSFofTerm

-                { after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); }

+                { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); }

         )

 ;

 finally {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
index 70e67806..8f5196ca 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
@@ -1906,20 +1906,20 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "ruleVLSFofTerm"

 

 

-    // $ANTLR start "entryRuleVLSFunctionFof"

-    // InternalVampireLanguage.g:628:1: entryRuleVLSFunctionFof : ruleVLSFunctionFof EOF ;

-    public final void entryRuleVLSFunctionFof() throws RecognitionException {

+    // $ANTLR start "entryRuleVLSFunctionAsTerm"

+    // InternalVampireLanguage.g:628:1: entryRuleVLSFunctionAsTerm : ruleVLSFunctionAsTerm EOF ;

+    public final void entryRuleVLSFunctionAsTerm() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:629:1: ( ruleVLSFunctionFof EOF )

-            // InternalVampireLanguage.g:630:1: ruleVLSFunctionFof EOF

+            // InternalVampireLanguage.g:629:1: ( ruleVLSFunctionAsTerm EOF )

+            // InternalVampireLanguage.g:630:1: ruleVLSFunctionAsTerm EOF

             {

-             before(grammarAccess.getVLSFunctionFofRule()); 

+             before(grammarAccess.getVLSFunctionAsTermRule()); 

             pushFollow(FOLLOW_1);

-            ruleVLSFunctionFof();

+            ruleVLSFunctionAsTerm();

 

             state._fsp--;

 

-             after(grammarAccess.getVLSFunctionFofRule()); 

+             after(grammarAccess.getVLSFunctionAsTermRule()); 

             match(input,EOF,FOLLOW_2); 

 

             }

@@ -1933,35 +1933,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "entryRuleVLSFunctionFof"

+    // $ANTLR end "entryRuleVLSFunctionAsTerm"

 

 

-    // $ANTLR start "ruleVLSFunctionFof"

-    // InternalVampireLanguage.g:637:1: ruleVLSFunctionFof : ( ( rule__VLSFunctionFof__Group__0 ) ) ;

-    public final void ruleVLSFunctionFof() throws RecognitionException {

+    // $ANTLR start "ruleVLSFunctionAsTerm"

+    // InternalVampireLanguage.g:637:1: ruleVLSFunctionAsTerm : ( ( rule__VLSFunctionAsTerm__Group__0 ) ) ;

+    public final void ruleVLSFunctionAsTerm() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:641:2: ( ( ( rule__VLSFunctionFof__Group__0 ) ) )

-            // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionFof__Group__0 ) )

+            // InternalVampireLanguage.g:641:2: ( ( ( rule__VLSFunctionAsTerm__Group__0 ) ) )

+            // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionAsTerm__Group__0 ) )

             {

-            // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionFof__Group__0 ) )

-            // InternalVampireLanguage.g:643:3: ( rule__VLSFunctionFof__Group__0 )

+            // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionAsTerm__Group__0 ) )

+            // InternalVampireLanguage.g:643:3: ( rule__VLSFunctionAsTerm__Group__0 )

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getGroup()); 

-            // InternalVampireLanguage.g:644:3: ( rule__VLSFunctionFof__Group__0 )

-            // InternalVampireLanguage.g:644:4: rule__VLSFunctionFof__Group__0

+             before(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); 

+            // InternalVampireLanguage.g:644:3: ( rule__VLSFunctionAsTerm__Group__0 )

+            // InternalVampireLanguage.g:644:4: rule__VLSFunctionAsTerm__Group__0

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group__0();

+            rule__VLSFunctionAsTerm__Group__0();

 

             state._fsp--;

 

 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getGroup()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); 

 

             }

 

@@ -1980,7 +1980,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "ruleVLSFunctionFof"

+    // $ANTLR end "ruleVLSFunctionAsTerm"

 

 

     // $ANTLR start "entryRuleVLSDefinedTerm"

@@ -4386,13 +4386,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSFofTerm__Alternatives"

-    // InternalVampireLanguage.g:1240:1: rule__VLSFofTerm__Alternatives : ( ( ruleVLSVariable ) | ( ruleVLSFunctionFof ) | ( ruleVLSDefinedTerm ) );

+    // InternalVampireLanguage.g:1240:1: rule__VLSFofTerm__Alternatives : ( ( ruleVLSVariable ) | ( ruleVLSFunctionAsTerm ) | ( ruleVLSDefinedTerm ) );

     public final void rule__VLSFofTerm__Alternatives() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:1244:1: ( ( ruleVLSVariable ) | ( ruleVLSFunctionFof ) | ( ruleVLSDefinedTerm ) )

+            // InternalVampireLanguage.g:1244:1: ( ( ruleVLSVariable ) | ( ruleVLSFunctionAsTerm ) | ( ruleVLSDefinedTerm ) )

             int alt19=3;

             switch ( input.LA(1) ) {

             case RULE_UPPER_WORD_ID:

@@ -4444,18 +4444,18 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionFof )

+                    // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionAsTerm )

                     {

-                    // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionFof )

-                    // InternalVampireLanguage.g:1252:3: ruleVLSFunctionFof

+                    // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionAsTerm )

+                    // InternalVampireLanguage.g:1252:3: ruleVLSFunctionAsTerm

                     {

-                     before(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); 

+                     before(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); 

                     pushFollow(FOLLOW_2);

-                    ruleVLSFunctionFof();

+                    ruleVLSFunctionAsTerm();

 

                     state._fsp--;

 

-                     after(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); 

+                     after(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); 

 

                     }

 

@@ -4498,9 +4498,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "rule__VLSFofTerm__Alternatives"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__FunctorAlternatives_0_0"

-    // InternalVampireLanguage.g:1267:1: rule__VLSFunctionFof__FunctorAlternatives_0_0 : ( ( RULE_LOWER_WORD_ID ) | ( RULE_SINGLE_QUOTE ) | ( RULE_DOLLAR_ID ) | ( RULE_DOUBLE_DOLLAR_ID ) );

-    public final void rule__VLSFunctionFof__FunctorAlternatives_0_0() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0"

+    // InternalVampireLanguage.g:1267:1: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 : ( ( RULE_LOWER_WORD_ID ) | ( RULE_SINGLE_QUOTE ) | ( RULE_DOLLAR_ID ) | ( RULE_DOUBLE_DOLLAR_ID ) );

+    public final void rule__VLSFunctionAsTerm__FunctorAlternatives_0_0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -4542,9 +4542,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                     // InternalVampireLanguage.g:1272:2: ( RULE_LOWER_WORD_ID )

                     // InternalVampireLanguage.g:1273:3: RULE_LOWER_WORD_ID

                     {

-                     before(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); 

+                     before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); 

                     match(input,RULE_LOWER_WORD_ID,FOLLOW_2); 

-                     after(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); 

+                     after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); 

 

                     }

 

@@ -4557,9 +4557,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                     // InternalVampireLanguage.g:1278:2: ( RULE_SINGLE_QUOTE )

                     // InternalVampireLanguage.g:1279:3: RULE_SINGLE_QUOTE

                     {

-                     before(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); 

+                     before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); 

                     match(input,RULE_SINGLE_QUOTE,FOLLOW_2); 

-                     after(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); 

+                     after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); 

 

                     }

 

@@ -4572,9 +4572,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                     // InternalVampireLanguage.g:1284:2: ( RULE_DOLLAR_ID )

                     // InternalVampireLanguage.g:1285:3: RULE_DOLLAR_ID

                     {

-                     before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); 

+                     before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); 

                     match(input,RULE_DOLLAR_ID,FOLLOW_2); 

-                     after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); 

+                     after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); 

 

                     }

 

@@ -4587,9 +4587,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                     // InternalVampireLanguage.g:1290:2: ( RULE_DOUBLE_DOLLAR_ID )

                     // InternalVampireLanguage.g:1291:3: RULE_DOUBLE_DOLLAR_ID

                     {

-                     before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); 

+                     before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); 

                     match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_2); 

-                     after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); 

+                     after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); 

 

                     }

 

@@ -4610,7 +4610,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__FunctorAlternatives_0_0"

+    // $ANTLR end "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0"

 

 

     // $ANTLR start "rule__VLSDefinedTerm__Alternatives"

@@ -15016,23 +15016,23 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "rule__VLSAtomicFunction__Group_1__6__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group__0"

-    // InternalVampireLanguage.g:4843:1: rule__VLSFunctionFof__Group__0 : rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1 ;

-    public final void rule__VLSFunctionFof__Group__0() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group__0"

+    // InternalVampireLanguage.g:4843:1: rule__VLSFunctionAsTerm__Group__0 : rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1 ;

+    public final void rule__VLSFunctionAsTerm__Group__0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4847:1: ( rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1 )

-            // InternalVampireLanguage.g:4848:2: rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1

+            // InternalVampireLanguage.g:4847:1: ( rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1 )

+            // InternalVampireLanguage.g:4848:2: rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1

             {

             pushFollow(FOLLOW_13);

-            rule__VLSFunctionFof__Group__0__Impl();

+            rule__VLSFunctionAsTerm__Group__0__Impl();

 

             state._fsp--;

 

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group__1();

+            rule__VLSFunctionAsTerm__Group__1();

 

             state._fsp--;

 

@@ -15051,35 +15051,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group__0"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group__0"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group__0__Impl"

-    // InternalVampireLanguage.g:4855:1: rule__VLSFunctionFof__Group__0__Impl : ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) ;

-    public final void rule__VLSFunctionFof__Group__0__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group__0__Impl"

+    // InternalVampireLanguage.g:4855:1: rule__VLSFunctionAsTerm__Group__0__Impl : ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) ;

+    public final void rule__VLSFunctionAsTerm__Group__0__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4859:1: ( ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) )

-            // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) )

+            // InternalVampireLanguage.g:4859:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) )

+            // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) )

             {

-            // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) )

-            // InternalVampireLanguage.g:4861:2: ( rule__VLSFunctionFof__FunctorAssignment_0 )

+            // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) )

+            // InternalVampireLanguage.g:4861:2: ( rule__VLSFunctionAsTerm__FunctorAssignment_0 )

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); 

-            // InternalVampireLanguage.g:4862:2: ( rule__VLSFunctionFof__FunctorAssignment_0 )

-            // InternalVampireLanguage.g:4862:3: rule__VLSFunctionFof__FunctorAssignment_0

+             before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); 

+            // InternalVampireLanguage.g:4862:2: ( rule__VLSFunctionAsTerm__FunctorAssignment_0 )

+            // InternalVampireLanguage.g:4862:3: rule__VLSFunctionAsTerm__FunctorAssignment_0

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__FunctorAssignment_0();

+            rule__VLSFunctionAsTerm__FunctorAssignment_0();

 

             state._fsp--;

 

 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); 

 

             }

 

@@ -15098,21 +15098,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group__0__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group__0__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group__1"

-    // InternalVampireLanguage.g:4870:1: rule__VLSFunctionFof__Group__1 : rule__VLSFunctionFof__Group__1__Impl ;

-    public final void rule__VLSFunctionFof__Group__1() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group__1"

+    // InternalVampireLanguage.g:4870:1: rule__VLSFunctionAsTerm__Group__1 : rule__VLSFunctionAsTerm__Group__1__Impl ;

+    public final void rule__VLSFunctionAsTerm__Group__1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4874:1: ( rule__VLSFunctionFof__Group__1__Impl )

-            // InternalVampireLanguage.g:4875:2: rule__VLSFunctionFof__Group__1__Impl

+            // InternalVampireLanguage.g:4874:1: ( rule__VLSFunctionAsTerm__Group__1__Impl )

+            // InternalVampireLanguage.g:4875:2: rule__VLSFunctionAsTerm__Group__1__Impl

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group__1__Impl();

+            rule__VLSFunctionAsTerm__Group__1__Impl();

 

             state._fsp--;

 

@@ -15131,24 +15131,24 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group__1"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group__1"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group__1__Impl"

-    // InternalVampireLanguage.g:4881:1: rule__VLSFunctionFof__Group__1__Impl : ( ( rule__VLSFunctionFof__Group_1__0 )? ) ;

-    public final void rule__VLSFunctionFof__Group__1__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group__1__Impl"

+    // InternalVampireLanguage.g:4881:1: rule__VLSFunctionAsTerm__Group__1__Impl : ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) ;

+    public final void rule__VLSFunctionAsTerm__Group__1__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4885:1: ( ( ( rule__VLSFunctionFof__Group_1__0 )? ) )

-            // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionFof__Group_1__0 )? )

+            // InternalVampireLanguage.g:4885:1: ( ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) )

+            // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionAsTerm__Group_1__0 )? )

             {

-            // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionFof__Group_1__0 )? )

-            // InternalVampireLanguage.g:4887:2: ( rule__VLSFunctionFof__Group_1__0 )?

+            // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionAsTerm__Group_1__0 )? )

+            // InternalVampireLanguage.g:4887:2: ( rule__VLSFunctionAsTerm__Group_1__0 )?

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); 

-            // InternalVampireLanguage.g:4888:2: ( rule__VLSFunctionFof__Group_1__0 )?

+             before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); 

+            // InternalVampireLanguage.g:4888:2: ( rule__VLSFunctionAsTerm__Group_1__0 )?

             int alt36=2;

             int LA36_0 = input.LA(1);

 

@@ -15157,10 +15157,10 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             }

             switch (alt36) {

                 case 1 :

-                    // InternalVampireLanguage.g:4888:3: rule__VLSFunctionFof__Group_1__0

+                    // InternalVampireLanguage.g:4888:3: rule__VLSFunctionAsTerm__Group_1__0

                     {

                     pushFollow(FOLLOW_2);

-                    rule__VLSFunctionFof__Group_1__0();

+                    rule__VLSFunctionAsTerm__Group_1__0();

 

                     state._fsp--;

 

@@ -15170,7 +15170,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); 

 

             }

 

@@ -15189,26 +15189,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group__1__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group__1__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__0"

-    // InternalVampireLanguage.g:4897:1: rule__VLSFunctionFof__Group_1__0 : rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1 ;

-    public final void rule__VLSFunctionFof__Group_1__0() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__0"

+    // InternalVampireLanguage.g:4897:1: rule__VLSFunctionAsTerm__Group_1__0 : rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1 ;

+    public final void rule__VLSFunctionAsTerm__Group_1__0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4901:1: ( rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1 )

-            // InternalVampireLanguage.g:4902:2: rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1

+            // InternalVampireLanguage.g:4901:1: ( rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1 )

+            // InternalVampireLanguage.g:4902:2: rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1

             {

             pushFollow(FOLLOW_38);

-            rule__VLSFunctionFof__Group_1__0__Impl();

+            rule__VLSFunctionAsTerm__Group_1__0__Impl();

 

             state._fsp--;

 

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1__1();

+            rule__VLSFunctionAsTerm__Group_1__1();

 

             state._fsp--;

 

@@ -15227,12 +15227,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__0"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__0"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__0__Impl"

-    // InternalVampireLanguage.g:4909:1: rule__VLSFunctionFof__Group_1__0__Impl : ( '(' ) ;

-    public final void rule__VLSFunctionFof__Group_1__0__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__0__Impl"

+    // InternalVampireLanguage.g:4909:1: rule__VLSFunctionAsTerm__Group_1__0__Impl : ( '(' ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1__0__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -15243,9 +15243,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             // InternalVampireLanguage.g:4914:1: ( '(' )

             // InternalVampireLanguage.g:4915:2: '('

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); 

+             before(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); 

             match(input,49,FOLLOW_2); 

-             after(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); 

 

             }

 

@@ -15264,26 +15264,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__0__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__0__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__1"

-    // InternalVampireLanguage.g:4924:1: rule__VLSFunctionFof__Group_1__1 : rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2 ;

-    public final void rule__VLSFunctionFof__Group_1__1() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__1"

+    // InternalVampireLanguage.g:4924:1: rule__VLSFunctionAsTerm__Group_1__1 : rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2 ;

+    public final void rule__VLSFunctionAsTerm__Group_1__1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4928:1: ( rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2 )

-            // InternalVampireLanguage.g:4929:2: rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2

+            // InternalVampireLanguage.g:4928:1: ( rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2 )

+            // InternalVampireLanguage.g:4929:2: rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2

             {

             pushFollow(FOLLOW_18);

-            rule__VLSFunctionFof__Group_1__1__Impl();

+            rule__VLSFunctionAsTerm__Group_1__1__Impl();

 

             state._fsp--;

 

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1__2();

+            rule__VLSFunctionAsTerm__Group_1__2();

 

             state._fsp--;

 

@@ -15302,35 +15302,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__1"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__1"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__1__Impl"

-    // InternalVampireLanguage.g:4936:1: rule__VLSFunctionFof__Group_1__1__Impl : ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) ;

-    public final void rule__VLSFunctionFof__Group_1__1__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__1__Impl"

+    // InternalVampireLanguage.g:4936:1: rule__VLSFunctionAsTerm__Group_1__1__Impl : ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1__1__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4940:1: ( ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) )

-            // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) )

+            // InternalVampireLanguage.g:4940:1: ( ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) )

+            // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) )

             {

-            // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) )

-            // InternalVampireLanguage.g:4942:2: ( rule__VLSFunctionFof__TermsAssignment_1_1 )

+            // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) )

+            // InternalVampireLanguage.g:4942:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 )

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); 

-            // InternalVampireLanguage.g:4943:2: ( rule__VLSFunctionFof__TermsAssignment_1_1 )

-            // InternalVampireLanguage.g:4943:3: rule__VLSFunctionFof__TermsAssignment_1_1

+             before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); 

+            // InternalVampireLanguage.g:4943:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 )

+            // InternalVampireLanguage.g:4943:3: rule__VLSFunctionAsTerm__TermsAssignment_1_1

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__TermsAssignment_1_1();

+            rule__VLSFunctionAsTerm__TermsAssignment_1_1();

 

             state._fsp--;

 

 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); 

 

             }

 

@@ -15349,26 +15349,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__1__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__1__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__2"

-    // InternalVampireLanguage.g:4951:1: rule__VLSFunctionFof__Group_1__2 : rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3 ;

-    public final void rule__VLSFunctionFof__Group_1__2() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__2"

+    // InternalVampireLanguage.g:4951:1: rule__VLSFunctionAsTerm__Group_1__2 : rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3 ;

+    public final void rule__VLSFunctionAsTerm__Group_1__2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4955:1: ( rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3 )

-            // InternalVampireLanguage.g:4956:2: rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3

+            // InternalVampireLanguage.g:4955:1: ( rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3 )

+            // InternalVampireLanguage.g:4956:2: rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3

             {

             pushFollow(FOLLOW_18);

-            rule__VLSFunctionFof__Group_1__2__Impl();

+            rule__VLSFunctionAsTerm__Group_1__2__Impl();

 

             state._fsp--;

 

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1__3();

+            rule__VLSFunctionAsTerm__Group_1__3();

 

             state._fsp--;

 

@@ -15387,24 +15387,24 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__2"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__2"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__2__Impl"

-    // InternalVampireLanguage.g:4963:1: rule__VLSFunctionFof__Group_1__2__Impl : ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) ;

-    public final void rule__VLSFunctionFof__Group_1__2__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__2__Impl"

+    // InternalVampireLanguage.g:4963:1: rule__VLSFunctionAsTerm__Group_1__2__Impl : ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1__2__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4967:1: ( ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) )

-            // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionFof__Group_1_2__0 )* )

+            // InternalVampireLanguage.g:4967:1: ( ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) )

+            // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* )

             {

-            // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionFof__Group_1_2__0 )* )

-            // InternalVampireLanguage.g:4969:2: ( rule__VLSFunctionFof__Group_1_2__0 )*

+            // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* )

+            // InternalVampireLanguage.g:4969:2: ( rule__VLSFunctionAsTerm__Group_1_2__0 )*

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); 

-            // InternalVampireLanguage.g:4970:2: ( rule__VLSFunctionFof__Group_1_2__0 )*

+             before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); 

+            // InternalVampireLanguage.g:4970:2: ( rule__VLSFunctionAsTerm__Group_1_2__0 )*

             loop37:

             do {

                 int alt37=2;

@@ -15417,10 +15417,10 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

                 switch (alt37) {

                 case 1 :

-                    // InternalVampireLanguage.g:4970:3: rule__VLSFunctionFof__Group_1_2__0

+                    // InternalVampireLanguage.g:4970:3: rule__VLSFunctionAsTerm__Group_1_2__0

                     {

                     pushFollow(FOLLOW_10);

-                    rule__VLSFunctionFof__Group_1_2__0();

+                    rule__VLSFunctionAsTerm__Group_1_2__0();

 

                     state._fsp--;

 

@@ -15433,7 +15433,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
                 }

             } while (true);

 

-             after(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); 

 

             }

 

@@ -15452,21 +15452,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__2__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__2__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__3"

-    // InternalVampireLanguage.g:4978:1: rule__VLSFunctionFof__Group_1__3 : rule__VLSFunctionFof__Group_1__3__Impl ;

-    public final void rule__VLSFunctionFof__Group_1__3() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__3"

+    // InternalVampireLanguage.g:4978:1: rule__VLSFunctionAsTerm__Group_1__3 : rule__VLSFunctionAsTerm__Group_1__3__Impl ;

+    public final void rule__VLSFunctionAsTerm__Group_1__3() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:4982:1: ( rule__VLSFunctionFof__Group_1__3__Impl )

-            // InternalVampireLanguage.g:4983:2: rule__VLSFunctionFof__Group_1__3__Impl

+            // InternalVampireLanguage.g:4982:1: ( rule__VLSFunctionAsTerm__Group_1__3__Impl )

+            // InternalVampireLanguage.g:4983:2: rule__VLSFunctionAsTerm__Group_1__3__Impl

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1__3__Impl();

+            rule__VLSFunctionAsTerm__Group_1__3__Impl();

 

             state._fsp--;

 

@@ -15485,12 +15485,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__3"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__3"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1__3__Impl"

-    // InternalVampireLanguage.g:4989:1: rule__VLSFunctionFof__Group_1__3__Impl : ( ')' ) ;

-    public final void rule__VLSFunctionFof__Group_1__3__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__3__Impl"

+    // InternalVampireLanguage.g:4989:1: rule__VLSFunctionAsTerm__Group_1__3__Impl : ( ')' ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1__3__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -15501,9 +15501,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             // InternalVampireLanguage.g:4994:1: ( ')' )

             // InternalVampireLanguage.g:4995:2: ')'

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); 

+             before(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); 

             match(input,50,FOLLOW_2); 

-             after(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); 

 

             }

 

@@ -15522,26 +15522,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1__3__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__3__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1_2__0"

-    // InternalVampireLanguage.g:5005:1: rule__VLSFunctionFof__Group_1_2__0 : rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1 ;

-    public final void rule__VLSFunctionFof__Group_1_2__0() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__0"

+    // InternalVampireLanguage.g:5005:1: rule__VLSFunctionAsTerm__Group_1_2__0 : rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1 ;

+    public final void rule__VLSFunctionAsTerm__Group_1_2__0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:5009:1: ( rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1 )

-            // InternalVampireLanguage.g:5010:2: rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1

+            // InternalVampireLanguage.g:5009:1: ( rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1 )

+            // InternalVampireLanguage.g:5010:2: rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1

             {

             pushFollow(FOLLOW_38);

-            rule__VLSFunctionFof__Group_1_2__0__Impl();

+            rule__VLSFunctionAsTerm__Group_1_2__0__Impl();

 

             state._fsp--;

 

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1_2__1();

+            rule__VLSFunctionAsTerm__Group_1_2__1();

 

             state._fsp--;

 

@@ -15560,12 +15560,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1_2__0"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__0"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1_2__0__Impl"

-    // InternalVampireLanguage.g:5017:1: rule__VLSFunctionFof__Group_1_2__0__Impl : ( ',' ) ;

-    public final void rule__VLSFunctionFof__Group_1_2__0__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__0__Impl"

+    // InternalVampireLanguage.g:5017:1: rule__VLSFunctionAsTerm__Group_1_2__0__Impl : ( ',' ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1_2__0__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -15576,9 +15576,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             // InternalVampireLanguage.g:5022:1: ( ',' )

             // InternalVampireLanguage.g:5023:2: ','

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); 

+             before(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); 

             match(input,45,FOLLOW_2); 

-             after(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); 

 

             }

 

@@ -15597,21 +15597,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1_2__0__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__0__Impl"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1_2__1"

-    // InternalVampireLanguage.g:5032:1: rule__VLSFunctionFof__Group_1_2__1 : rule__VLSFunctionFof__Group_1_2__1__Impl ;

-    public final void rule__VLSFunctionFof__Group_1_2__1() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__1"

+    // InternalVampireLanguage.g:5032:1: rule__VLSFunctionAsTerm__Group_1_2__1 : rule__VLSFunctionAsTerm__Group_1_2__1__Impl ;

+    public final void rule__VLSFunctionAsTerm__Group_1_2__1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:5036:1: ( rule__VLSFunctionFof__Group_1_2__1__Impl )

-            // InternalVampireLanguage.g:5037:2: rule__VLSFunctionFof__Group_1_2__1__Impl

+            // InternalVampireLanguage.g:5036:1: ( rule__VLSFunctionAsTerm__Group_1_2__1__Impl )

+            // InternalVampireLanguage.g:5037:2: rule__VLSFunctionAsTerm__Group_1_2__1__Impl

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__Group_1_2__1__Impl();

+            rule__VLSFunctionAsTerm__Group_1_2__1__Impl();

 

             state._fsp--;

 

@@ -15630,35 +15630,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1_2__1"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__1"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__Group_1_2__1__Impl"

-    // InternalVampireLanguage.g:5043:1: rule__VLSFunctionFof__Group_1_2__1__Impl : ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) ;

-    public final void rule__VLSFunctionFof__Group_1_2__1__Impl() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__1__Impl"

+    // InternalVampireLanguage.g:5043:1: rule__VLSFunctionAsTerm__Group_1_2__1__Impl : ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) ;

+    public final void rule__VLSFunctionAsTerm__Group_1_2__1__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:5047:1: ( ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) )

-            // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) )

+            // InternalVampireLanguage.g:5047:1: ( ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) )

+            // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) )

             {

-            // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) )

-            // InternalVampireLanguage.g:5049:2: ( rule__VLSFunctionFof__TermsAssignment_1_2_1 )

+            // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) )

+            // InternalVampireLanguage.g:5049:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 )

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); 

-            // InternalVampireLanguage.g:5050:2: ( rule__VLSFunctionFof__TermsAssignment_1_2_1 )

-            // InternalVampireLanguage.g:5050:3: rule__VLSFunctionFof__TermsAssignment_1_2_1

+             before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); 

+            // InternalVampireLanguage.g:5050:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 )

+            // InternalVampireLanguage.g:5050:3: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__TermsAssignment_1_2_1();

+            rule__VLSFunctionAsTerm__TermsAssignment_1_2_1();

 

             state._fsp--;

 

 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); 

 

             }

 

@@ -15677,7 +15677,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__Group_1_2__1__Impl"

+    // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__1__Impl"

 

 

     // $ANTLR start "rule__VLSDefinedTerm__Group_0__0"

@@ -18009,32 +18009,32 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "rule__VLSVariable__NameAssignment"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__FunctorAssignment_0"

-    // InternalVampireLanguage.g:5894:1: rule__VLSFunctionFof__FunctorAssignment_0 : ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) ;

-    public final void rule__VLSFunctionFof__FunctorAssignment_0() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__FunctorAssignment_0"

+    // InternalVampireLanguage.g:5894:1: rule__VLSFunctionAsTerm__FunctorAssignment_0 : ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) ;

+    public final void rule__VLSFunctionAsTerm__FunctorAssignment_0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:5898:1: ( ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) )

-            // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) )

+            // InternalVampireLanguage.g:5898:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) )

+            // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

             {

-            // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) )

-            // InternalVampireLanguage.g:5900:3: ( rule__VLSFunctionFof__FunctorAlternatives_0_0 )

+            // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

+            // InternalVampireLanguage.g:5900:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); 

-            // InternalVampireLanguage.g:5901:3: ( rule__VLSFunctionFof__FunctorAlternatives_0_0 )

-            // InternalVampireLanguage.g:5901:4: rule__VLSFunctionFof__FunctorAlternatives_0_0

+             before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); 

+            // InternalVampireLanguage.g:5901:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

+            // InternalVampireLanguage.g:5901:4: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0

             {

             pushFollow(FOLLOW_2);

-            rule__VLSFunctionFof__FunctorAlternatives_0_0();

+            rule__VLSFunctionAsTerm__FunctorAlternatives_0_0();

 

             state._fsp--;

 

 

             }

 

-             after(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); 

 

             }

 

@@ -18053,12 +18053,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__FunctorAssignment_0"

+    // $ANTLR end "rule__VLSFunctionAsTerm__FunctorAssignment_0"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__TermsAssignment_1_1"

-    // InternalVampireLanguage.g:5909:1: rule__VLSFunctionFof__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ;

-    public final void rule__VLSFunctionFof__TermsAssignment_1_1() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_1"

+    // InternalVampireLanguage.g:5909:1: rule__VLSFunctionAsTerm__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ;

+    public final void rule__VLSFunctionAsTerm__TermsAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -18069,13 +18069,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             // InternalVampireLanguage.g:5914:2: ( ruleVLSFofTerm )

             // InternalVampireLanguage.g:5915:3: ruleVLSFofTerm

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); 

+             before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); 

             pushFollow(FOLLOW_2);

             ruleVLSFofTerm();

 

             state._fsp--;

 

-             after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); 

 

             }

 

@@ -18094,12 +18094,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__TermsAssignment_1_1"

+    // $ANTLR end "rule__VLSFunctionAsTerm__TermsAssignment_1_1"

 

 

-    // $ANTLR start "rule__VLSFunctionFof__TermsAssignment_1_2_1"

-    // InternalVampireLanguage.g:5924:1: rule__VLSFunctionFof__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ;

-    public final void rule__VLSFunctionFof__TermsAssignment_1_2_1() throws RecognitionException {

+    // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1"

+    // InternalVampireLanguage.g:5924:1: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ;

+    public final void rule__VLSFunctionAsTerm__TermsAssignment_1_2_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

@@ -18110,13 +18110,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             // InternalVampireLanguage.g:5929:2: ( ruleVLSFofTerm )

             // InternalVampireLanguage.g:5930:3: ruleVLSFofTerm

             {

-             before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); 

+             before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); 

             pushFollow(FOLLOW_2);

             ruleVLSFofTerm();

 

             state._fsp--;

 

-             after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); 

+             after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); 

 

             }

 

@@ -18135,7 +18135,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
         }

         return ;

     }

-    // $ANTLR end "rule__VLSFunctionFof__TermsAssignment_1_2_1"

+    // $ANTLR end "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1"

 

 

     // $ANTLR start "rule__VLSDefinedTerm__ValueAssignment_0_1"

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
index 89a95266..059cb511 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
index 362c1696..3c6361f3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF
index 7e9ef500..0667fc7f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: ca.mcgill.ecse.dslreasoner.vampire.language,
  org.junit;bundle-version="4.12.0",

  org.eclipse.xtext.testing,

  org.eclipse.xtext.xbase.testing,

- org.eclipse.xtext.xbase.lib

+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: ca.mcgill.ecse.dslreasoner.tests;x-internal=true

 Import-Package: org.hamcrest.core,

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java
index f3c1588b..0362a2fa 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.tests;

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java
index 68417ee9..1c2ad5b4 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui.tests;

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF
index baaefd41..48ee7417 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: ca.mcgill.ecse.dslreasoner.vampire.language,
  org.eclipse.compare,

  org.eclipse.xtext.builder,

  org.eclipse.xtend.lib;resolution:=optional,

- org.eclipse.xtext.xbase.lib

+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"

 Import-Package: org.apache.log4j

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: ca.mcgill.ecse.dslreasoner.ui.contentassist,

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen
new file mode 100644
index 00000000..cbb504dd
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+<plugin>

+        <extension

+                point="org.eclipse.ui.editors">

+                <editor

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"

+                        contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"

+                        default="true"

+                        extensions="tptp"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        name="VampireLanguage Editor">

+                </editor>

+        </extension>

+        <extension

+                point="org.eclipse.ui.handlers">

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"

+                        commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">

+                        <activeWhen>

+                                <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                </reference>

+                        </activeWhen>

+                </handler>

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"

+                        commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate">

+                <activeWhen>

+                        <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                        </reference>

+                </activeWhen>

+                </handler>

+                <!-- copy qualified name -->

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"

+                        commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">

+                        <activeWhen>

+                                <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" />

+                        </activeWhen>

+                </handler>

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"

+                        commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">

+                        <activeWhen>

+                                <and>

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" />

+                                        <iterate>

+                                                <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

+                                        </iterate>

+                                </and>

+                        </activeWhen>

+                </handler>

+        </extension>

+        <extension point="org.eclipse.core.expressions.definitions">

+                <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                        <and>

+                                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>

+                                <with variable="activeEditor">

+                                        <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"

+                                                value="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                                                forcePluginActivation="true"/>

+                                </with>

+                        </and>

+                </definition>

+                <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened">

+                        <and>

+                                <reference definitionId="isXtextEditorActive"/>

+                                <with variable="activeEditor">

+                                        <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"

+                                                value="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                                                forcePluginActivation="true"/>

+                                </with>

+                        </and>

+                </definition>

+        </extension>

+        <extension

+                        point="org.eclipse.ui.preferencePages">

+                <page

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        name="VampireLanguage">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.coloring"

+                        name="Syntax Coloring">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.templates"

+                        name="Templates">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+        </extension>

+        <extension

+                        point="org.eclipse.ui.propertyPages">

+                <page

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        name="VampireLanguage">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                        <enabledWhen>

+                                <adapt type="org.eclipse.core.resources.IProject"/>

+                        </enabledWhen>

+                        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

+                </page>

+        </extension>

+        <extension

+                point="org.eclipse.ui.keywords">

+                <keyword

+                        id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"

+                        label="VampireLanguage"/>

+        </extension>

+        <extension

+                point="org.eclipse.ui.commands">

+        <command

+                        description="Trigger expensive validation"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate"

+                        name="Validate">

+        </command>

+        <!-- copy qualified name -->

+        <command

+                        id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

+                        categoryId="org.eclipse.ui.category.edit"

+                        description="Copy the qualified name for the selected element"

+                        name="Copy Qualified Name">

+        </command>

+        <command

+                        id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"

+                        categoryId="org.eclipse.ui.category.edit"

+                        description="Copy the qualified name for the selected element"

+                        name="Copy Qualified Name">

+        </command>

+        </extension>

+        <extension point="org.eclipse.ui.menus">

+                <menuContribution

+                        locationURI="popup:#TextEditorContext?after=group.edit">

+                         <command

+                                 commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate"

+                                 style="push"

+                                 tooltip="Trigger expensive validation">

+                        <visibleWhen checkEnabled="false">

+                                <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                </reference>

+                        </visibleWhen>

+                </command>

+                </menuContribution>

+                <!-- copy qualified name -->

+                <menuContribution locationURI="popup:#TextEditorContext?after=copy">

+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

+                                style="push" tooltip="Copy Qualified Name">

+                                <visibleWhen checkEnabled="false">

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" />

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+                <menuContribution locationURI="menu:edit?after=copy">

+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

+                                style="push" tooltip="Copy Qualified Name">

+                                <visibleWhen checkEnabled="false">

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" />

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+                <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">

+                        <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"

+                                style="push" tooltip="Copy Qualified Name">

+                                <visibleWhen checkEnabled="false">

+                                        <and>

+                                                <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" />

+                                                <iterate>

+                                                        <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

+                                                </iterate>

+                                        </and>

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+        </extension>

+        <extension point="org.eclipse.ui.menus">

+                <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">

+                        <command commandId="org.eclipse.xtext.ui.editor.FindReferences">

+                                <visibleWhen checkEnabled="false">

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                        </reference>

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+        </extension>

+        <extension point="org.eclipse.ui.handlers">

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"

+                        commandId="org.eclipse.xtext.ui.editor.FindReferences">

+                        <activeWhen>

+                                <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                </reference>

+                        </activeWhen>

+                </handler>

+        </extension>

+        <extension point="org.eclipse.core.contenttype.contentTypes">

+                <content-type

+                        base-type="org.eclipse.core.runtime.text"

+                        file-extensions="tptp"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype"

+                        name="VampireLanguage File"

+                        priority="normal">

+                </content-type>

+        </extension>

+        <!-- adding resource factories -->

+        <extension

+                point="org.eclipse.emf.ecore.extension_parser">

+                <parser

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"

+                        type="tptp">

+                </parser>

+        </extension>

+        <extension point="org.eclipse.xtext.extension_resourceServiceProvider">

+                <resourceServiceProvider

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"

+                        uriExtension="tptp">

+                </resourceServiceProvider>

+        </extension>

+        <!-- marker definitions for ca.mcgill.ecse.dslreasoner.VampireLanguage -->

+        <extension

+                        id="vampirelanguage.check.fast"

+                        name="VampireLanguage Problem"

+                        point="org.eclipse.core.resources.markers">

+                <super type="org.eclipse.xtext.ui.check.fast"/>

+                <persistent value="true"/>

+        </extension>

+        <extension

+                        id="vampirelanguage.check.normal"

+                        name="VampireLanguage Problem"

+                        point="org.eclipse.core.resources.markers">

+                <super type="org.eclipse.xtext.ui.check.normal"/>

+                <persistent value="true"/>

+        </extension>

+        <extension

+                        id="vampirelanguage.check.expensive"

+                        name="VampireLanguage Problem"

+                        point="org.eclipse.core.resources.markers">

+                <super type="org.eclipse.xtext.ui.check.expensive"/>

+                <persistent value="true"/>

+        </extension>

+        <extension point="org.eclipse.ui.preferencePages">

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validator.preferencePage"

+                        name="Errors/Warnings">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+        </extension>

+        <extension point="org.eclipse.xtext.builder.participant">

+                <participant

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"

+                        fileExtensions="tptp"/>

+        </extension>

+        <extension point="org.eclipse.ui.preferencePages">

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.preferencePage"

+                        name="Compiler">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+        </extension>

+        <extension point="org.eclipse.ui.propertyPages">

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.propertyPage"

+                        name="Compiler">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                        <enabledWhen>

+                                <adapt type="org.eclipse.core.resources.IProject"/>

+                        </enabledWhen>

+                        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

+                </page>

+        </extension>

+        <extension point="org.eclipse.ui.menus">

+                <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">

+                        <command

+                                commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"

+                                id="ca.mcgill.ecse.dslreasoner.VampireLanguage.OpenGeneratedCode"

+                                style="push">

+                                <visibleWhen checkEnabled="false">

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" />

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+        </extension>

+        <extension point="org.eclipse.ui.handlers">

+                <handler

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"

+                        commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">

+                        <activeWhen>

+                                <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" />

+                        </activeWhen>

+                </handler>

+        </extension>

+        <!-- Quick Outline -->

+        <extension

+                point="org.eclipse.ui.handlers">

+                <handler 

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"

+                        commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">

+                        <activeWhen>

+                                <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                </reference>

+                        </activeWhen>

+                </handler>

+        </extension>

+        <extension

+                point="org.eclipse.ui.commands">

+                <command

+                        description="Open the quick outline."

+                        id="org.eclipse.xtext.ui.editor.outline.QuickOutline"

+                        name="Quick Outline">

+                </command>

+        </extension>

+        <extension point="org.eclipse.ui.menus">

+                <menuContribution

+                        locationURI="popup:#TextEditorContext?after=group.open">

+                        <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"

+                                style="push"

+                                tooltip="Open Quick Outline">

+                                <visibleWhen checkEnabled="false">

+                                        <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"/>

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+        </extension>

+        <!-- quickfix marker resolution generator for ca.mcgill.ecse.dslreasoner.VampireLanguage -->

+        <extension

+                        point="org.eclipse.ui.ide.markerResolution">

+                <markerResolutionGenerator

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+                        markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.fast">

+                        <attribute

+                                name="FIXABLE_KEY"

+                                value="true">

+                        </attribute>

+                </markerResolutionGenerator>

+                <markerResolutionGenerator

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+                        markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.normal">

+                        <attribute

+                                name="FIXABLE_KEY"

+                                value="true">

+                        </attribute>

+                </markerResolutionGenerator>

+                <markerResolutionGenerator

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+                        markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.expensive">

+                        <attribute

+                                name="FIXABLE_KEY"

+                                value="true">

+                        </attribute>

+                </markerResolutionGenerator>

+        </extension>

+        <!-- Rename Refactoring -->

+        <extension point="org.eclipse.ui.handlers">

+                <handler 

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"

+                        commandId="org.eclipse.xtext.ui.refactoring.RenameElement">

+                        <activeWhen>

+                                <reference

+                                        definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                </reference>

+                        </activeWhen>

+                </handler>

+        </extension>

+        <extension point="org.eclipse.ui.menus">

+                <menuContribution

+                        locationURI="popup:#TextEditorContext?after=group.edit">

+                        <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"

+                                style="push">

+                                <visibleWhen checkEnabled="false">

+                                        <reference

+                                                definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened">

+                                        </reference>

+                                </visibleWhen>

+                        </command>

+                </menuContribution>

+        </extension>

+        <extension point="org.eclipse.ui.preferencePages">

+                <page

+                        category="ca.mcgill.ecse.dslreasoner.VampireLanguage"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"

+                        id="ca.mcgill.ecse.dslreasoner.VampireLanguage.refactoring"

+                        name="Refactoring">

+                        <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/>

+                </page>

+        </extension>

+        <extension point="org.eclipse.compare.contentViewers">

+                <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

+                        extensions="tptp">

+                </viewer>

+                <contentTypeBinding

+                        contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype"

+                        contentViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers" />

+        </extension>

+        <extension point="org.eclipse.compare.contentMergeViewers">

+                <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

+                        extensions="tptp" label="VampireLanguage Compare">

+                </viewer>

+                <contentTypeBinding

+                        contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype"

+                        contentMergeViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers" />

+        </extension>

+        <extension point="org.eclipse.ui.editors.documentProviders">

+                <provider id="ca.mcgill.ecse.dslreasoner.VampireLanguage.editors.documentProviders"

+                        class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"

+                        extensions="tptp">

+                </provider>

+        </extension>

+        <extension point="org.eclipse.team.core.fileTypes">

+                <fileTypes

+                        extension="tptp"

+                        type="text">

+                </fileTypes>

+        </extension>

+</plugin>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
index 5ef7b226..726c20f5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui;

 

@@ -11,6 +11,7 @@ import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageDescriptionLabelPro
 import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider;

 import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider;

 import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider;

+import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidatorConfigurationBlock;

 import com.google.inject.Binder;

 import com.google.inject.Provider;

 import com.google.inject.name.Names;

@@ -78,6 +79,7 @@ import org.eclipse.xtext.ui.refactoring.ui.IRenameSupport;
 import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences;

 import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider;

 import org.eclipse.xtext.ui.shared.Access;

+import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock;

 

 /**

  * Manual modifications go to {@link VampireLanguageUiModule}.

@@ -135,6 +137,11 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
                 binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class));

         }

         

+        // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2

+        public Class<? extends AbstractValidatorConfigurationBlock> bindAbstractValidatorConfigurationBlock() {

+                return VampireLanguageValidatorConfigurationBlock.class;

+        }

+        

         // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2

         public Class<? extends PrefixMatcher> bindPrefixMatcher() {

                 return FQNPrefixMatcher.class;

@@ -223,6 +230,13 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

+        public void configureIPreferenceStoreInitializer(Binder binder) {

+                binder.bind(IPreferenceStoreInitializer.class)

+                        .annotatedWith(Names.named("RefactoringPreferences"))

+                        .to(RefactoringPreferences.Initializer.class);

+        }

+        

+        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameStrategy> bindIRenameStrategy() {

                 return DefaultRenameStrategy.class;

         }

@@ -233,13 +247,6 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

-        public void configureIPreferenceStoreInitializer(Binder binder) {

-                binder.bind(IPreferenceStoreInitializer.class)

-                        .annotatedWith(Names.named("RefactoringPreferences"))

-                        .to(RefactoringPreferences.Initializer.class);

-        }

-        

-        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {

                 return DefaultRenameRefactoringProvider.class;

         }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
index 18440e58..1dc2d4cb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
@@ -1,10 +1,11 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui;

 

 import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator;

 import com.google.inject.Injector;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

 import org.osgi.framework.Bundle;

 

@@ -16,12 +17,13 @@ public class VampireLanguageExecutableExtensionFactory extends AbstractGuiceAwar
 

         @Override

         protected Bundle getBundle() {

-                return LanguageActivator.getInstance().getBundle();

+                return Platform.getBundle(LanguageActivator.PLUGIN_ID);

         }

         

         @Override

         protected Injector getInjector() {

-                return LanguageActivator.getInstance().getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE);

+                LanguageActivator activator = LanguageActivator.getInstance();

+                return activator != null ? activator.getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE) : null;

         }

-        

+

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
index aead1baf..8e11f8c7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui.contentassist;

 

@@ -131,13 +131,13 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP
         public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

-        public void completeVLSFunctionFof_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void completeVLSFunctionAsTerm_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor);

         }

-        public void completeVLSFunctionFof_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void completeVLSFunctionAsTerm_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

         public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

@@ -267,7 +267,7 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP
         public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

-        public void complete_VLSFunctionFof(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void complete_VLSFunctionAsTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

         public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java
new file mode 100644
index 00000000..9faf6232
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java
@@ -0,0 +1,65 @@
+/*

+ * generated by Xtext 2.14.0

+ */

+package ca.mcgill.ecse.dslreasoner.validation;

+

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.xtext.ui.preferences.OptionsConfigurationBlock;

+import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock;

+import org.eclipse.xtext.validation.SeverityConverter;

+

+@SuppressWarnings("restriction")

+public class VampireLanguageValidatorConfigurationBlock extends AbstractValidatorConfigurationBlock {

+

+        @Override

+        protected void fillSettingsPage(Composite composite, int nColumns, int defaultIndent) {

+                addComboBox(VampireLanguageConfigurableIssueCodesProvider.DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent);

+        }

+

+        @Override

+        protected Job getBuildJob(IProject project) {

+                Job buildJob = new OptionsConfigurationBlock.BuildJob("Validation Settings Changed", project);

+                buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule());

+                buildJob.setUser(true);

+                return buildJob;

+        }

+

+        @Override

+        protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {

+                return new String[] { "Validation Settings Changed",

+                                "Validation settings have changed. A full rebuild is required for changes to take effect. Do the full build now?" };

+        }

+

+        @Override

+        protected void validateSettings(String changedKey, String oldValue, String newValue) {

+        }

+

+        protected Combo addComboBox(String prefKey, String label, Composite parent, int indent) {

+                String[] values = new String[] { SeverityConverter.SEVERITY_ERROR, SeverityConverter.SEVERITY_WARNING,

+                                SeverityConverter.SEVERITY_INFO, SeverityConverter.SEVERITY_IGNORE };

+                String[] valueLabels = new String[] { "Error", "Warning", "Info", "Ignore" };

+                Combo comboBox = addComboBox(parent, label, prefKey, indent, values, valueLabels);

+                return comboBox;

+        }

+

+        @Override

+        public void dispose() {

+                storeSectionExpansionStates(getDialogSettings());

+                super.dispose();

+        }

+

+        @Override

+        protected IDialogSettings getDialogSettings() {

+                IDialogSettings dialogSettings = super.getDialogSettings();

+                IDialogSettings section = dialogSettings.getSection("VampireLanguage");

+                if (section == null) {

+                        return dialogSettings.addNewSection("VampireLanguage");

+                }

+                return section;

+        }

+}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java
index eca3aa7f..b25ea8a3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal;

 

@@ -8,7 +8,6 @@ import ca.mcgill.ecse.dslreasoner.ui.VampireLanguageUiModule;
 import com.google.common.collect.Maps;

 import com.google.inject.Guice;

 import com.google.inject.Injector;

-import com.google.inject.Module;

 import java.util.Collections;

 import java.util.Map;

 import org.apache.log4j.Logger;

@@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext;
  */

 public class LanguageActivator extends AbstractUIPlugin {

 

+        public static final String PLUGIN_ID = "ca.mcgill.ecse.dslreasoner.vampire.language.ui";

         public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage";

         

         private static final Logger logger = Logger.getLogger(LanguageActivator.class);

@@ -60,10 +60,10 @@ public class LanguageActivator extends AbstractUIPlugin {
         

         protected Injector createInjector(String language) {

                 try {

-                        Module runtimeModule = getRuntimeModule(language);

-                        Module sharedStateModule = getSharedStateModule();

-                        Module uiModule = getUiModule(language);

-                        Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

+                        com.google.inject.Module runtimeModule = getRuntimeModule(language);

+                        com.google.inject.Module sharedStateModule = getSharedStateModule();

+                        com.google.inject.Module uiModule = getUiModule(language);

+                        com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

                         return Guice.createInjector(mergedModule);

                 } catch (Exception e) {

                         logger.error("Failed to create injector for " + language);

@@ -72,22 +72,23 @@ public class LanguageActivator extends AbstractUIPlugin {
                 }

         }

         

-        protected Module getRuntimeModule(String grammar) {

+        protected com.google.inject.Module getRuntimeModule(String grammar) {

                 if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) {

                         return new VampireLanguageRuntimeModule();

                 }

                 throw new IllegalArgumentException(grammar);

         }

         

-        protected Module getUiModule(String grammar) {

+        protected com.google.inject.Module getUiModule(String grammar) {

                 if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) {

                         return new VampireLanguageUiModule(this);

                 }

                 throw new IllegalArgumentException(grammar);

         }

         

-        protected Module getSharedStateModule() {

+        protected com.google.inject.Module getSharedStateModule() {

                 return new SharedStateModule();

         }

         

+        

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
index 67fbde4f..e00e853c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index 2f2eaa65..6f5209e7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF
index 77c42047..9e28a551 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF
@@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,

  org.eclipse.equinox.common;bundle-version="3.5.0",

  org.eclipse.emf.ecore,

- org.eclipse.xtext.xbase.lib,

+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",

  org.antlr.runtime,

  org.eclipse.xtext.util,

- org.eclipse.xtend.lib,

+ org.eclipse.xtend.lib;bundle-version="2.14.0",

  org.eclipse.emf.common

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: ca.mcgill.ecse.dslreasoner.generator,

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
index ff954f57..e529b684 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
@@ -54,7 +54,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionFof" eSuperTypes="#//VLSTerm">

+  <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionAsTerm" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="functor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="terms" upperBound="-1"

         eType="#//VLSTerm" containment="true"/>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
index 655f282b..ef216fb7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.12.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.14.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen"

     modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.language" forceOverwrite="true"

     modelName="VampireLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.13">

+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.14">

   <genPackages prefix="VampireLanguage" basePackage="ca.mcgill.ecse.dslreasoner" disposableProviderFactory="true"

       fileExtensions="tptp" ecorePackage="VampireLanguage.ecore#/">

     <genClasses ecoreClass="VampireLanguage.ecore#//VampireModel">

@@ -46,9 +46,9 @@
     <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSVariable/name"/>

     </genClasses>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSFunctionFof">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionFof/functor"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSFunctionFof/terms"/>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSFunctionAsTerm">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionAsTerm/functor"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSFunctionAsTerm/terms"/>

     </genClasses>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSDefinedTerm">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSDefinedTerm/value"/>

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
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

-entryRuleVLSFunctionFof returns [EObject current=null]:

-        { newCompositeNode(grammarAccess.getVLSFunctionFofRule()); }

-        iv_ruleVLSFunctionFof=ruleVLSFunctionFof

-        { $current=$iv_ruleVLSFunctionFof.current; }

+// Entry rule entryRuleVLSFunctionAsTerm

+entryRuleVLSFunctionAsTerm returns [EObject current=null]:

+        { newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); }

+        iv_ruleVLSFunctionAsTerm=ruleVLSFunctionAsTerm

+        { $current=$iv_ruleVLSFunctionAsTerm.current; }

         EOF;

 

-// Rule VLSFunctionFof

-ruleVLSFunctionFof returns [EObject current=null]

+// Rule VLSFunctionAsTerm

+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:2179: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_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"

-    // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionFof returns [EObject current=null] : iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF ;

-    public final EObject entryRuleVLSFunctionFof() throws RecognitionException {

+    // $ANTLR start "entryRuleVLSFunctionAsTerm"

+    // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionAsTerm returns [EObject current=null] : iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ;

+    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:2211:2: iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF

+            // InternalVampireLanguage.g:2210:58: (iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm 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"

-    // 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= ')' )? ) ;

-    public final EObject ruleVLSFunctionFof() throws RecognitionException {

+    // $ANTLR start "ruleVLSFunctionAsTerm"

+    // 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 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:

-                                sequence_VLSFunctionFof(context, (VLSFunctionFof) semanticObject); 

+                        case VampireLanguagePackage.VLS_FUNCTION_AS_TERM:

+                                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

-         *     VLSFunctionFof returns VLSFunctionFof

+         *     VLSFofTerm returns VLSFunctionAsTerm

+         *     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

-                public RuleCall getVLSFunctionFofParserRuleCall_1() { return cVLSFunctionFofParserRuleCall_1; }

+                //VLSFunctionAsTerm

+                public RuleCall getVLSFunctionAsTermParserRuleCall_1() { return cVLSFunctionAsTermParserRuleCall_1; }

                 

                 //VLSDefinedTerm

                 public RuleCall getVLSDefinedTermParserRuleCall_2() { return cVLSDefinedTermParserRuleCall_2; }

         }

-        public class VLSFunctionFofElements extends AbstractParserRuleElementFinder {

-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFunctionFof");

+        public class VLSFunctionAsTermElements extends AbstractParserRuleElementFinder {

+                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() {

-                return pVLSFunctionFof;

+        public VLSFunctionAsTermElements getVLSFunctionAsTermAccess() {

+                return pVLSFunctionAsTerm;

         }

         

-        public ParserRule getVLSFunctionFofRule() {

-                return getVLSFunctionFofAccess().getRule();

+        public ParserRule getVLSFunctionAsTermRule() {

+                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.VampireLanguagePackageImpl#getVLSFunctionFof()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl

+   * @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>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof

+   * @return the meta object for class '<em>VLS Function As Term</em>'.

+   * @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 #getVLSFunctionFof()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor()

+   * @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 #getVLSFunctionFof()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms()

+   * @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.VampireLanguagePackageImpl#getVLSFunctionFof()

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl

+     * @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();

-    return vlsFunctionFof;

+    VLSFunctionAsTermImpl vlsFunctionAsTerm = new VLSFunctionAsTermImpl();

+    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);

-    createEAttribute(vlsFunctionFofEClass, VLS_FUNCTION_FOF__FUNCTOR);

-    createEReference(vlsFunctionFofEClass, VLS_FUNCTION_FOF__TERMS);

+    vlsFunctionAsTermEClass = createEClass(VLS_FUNCTION_AS_TERM);

+    createEAttribute(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__FUNCTOR);

+    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);

-    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);

-    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);

+    initEClass(vlsFunctionAsTermEClass, VLSFunctionAsTerm.class, "VLSFunctionAsTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    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(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;

-        T result = caseVLSFunctionFof(vlsFunctionFof);

-        if (result == null) result = caseVLSTerm(vlsFunctionFof);

+        VLSFunctionAsTerm vlsFunctionAsTerm = (VLSFunctionAsTerm)theEObject;

+        T result = caseVLSFunctionAsTerm(vlsFunctionAsTerm);

+        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;

   }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
index 2b5958ca..7d20da72 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
@@ -289,10 +289,10 @@ VLSVariable :
 

 VLSFofTerm returns VLSTerm:

         //(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple)

-        (VLSVariable | VLSFunctionFof | VLSDefinedTerm )

+        (VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm )

 ;

 

-VLSFunctionFof:

+VLSFunctionAsTerm:

         //? on next line causes warning

         //TODO might need replace DOLLAR_ID with enum rule 

         functor = (LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID ) ( '(' terms += VLSFofTerm (',' terms += VLSFofTerm)* ')')?

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
index 503b9b33..834a13c3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
index bcff04c1..6895f687 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project
index 2221f39c..e73fac6d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project
@@ -6,6 +6,11 @@
         </projects>

         <buildSpec>

                 <buildCommand>

+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>

+                        <arguments>

+                        </arguments>

+                </buildCommand>

+                <buildCommand>

                         <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

                         <arguments>

                         </arguments>

@@ -30,5 +35,6 @@
                 <nature>org.eclipse.pde.PluginNature</nature>

                 <nature>org.eclipse.jdt.core.javanature</nature>

                 <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

+                <nature>org.eclipse.viatra.query.projectnature</nature>

         </natures>

 </projectDescription>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF
index 63d39592..6ed29084 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF
@@ -6,12 +6,17 @@ Bundle-Version: 1.0.0.qualifier
 Export-Package: ca.mcgill.ecse.dslreasoner.vampire.reasoner,
   ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder,
   ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries
-Require-Bundle: org.eclipse.xtend.lib,
+Require-Bundle: org.eclipse.emf.ecore,
+  org.eclipse.viatra.query.runtime.rete,
+  org.eclipse.viatra.query.runtime.localsearch,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.xtend.lib,
   hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
   hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
   ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
   org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
   org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.1.0",
   org.apache.log4j;bundle-version="1.2.15"
-Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.apache.log4j
+Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties
index aed85a48..efae4b07 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\

                .

 source.. = src/,\

+           src-gen/,\

            src-gen/

 output.. = bin/

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql
index 2db380e4..be5a7c1f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql
@@ -48,8 +48,8 @@ pattern VLSInequality(term: VLSInequality){
         VLSInequality(term);

 }

 

-pattern VLSFunctionFof(term: VLSFunctionFof){

-        VLSFunctionFof(term);

+pattern VLSFunctionFof(term: VLSFunctionAsTerm){

+        VLSFunctionAsTerm(term);

 }

 

 //pattern VLSFofTerm(term: VLSFofTerm){

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java
index 5a88b0b4..0e82d459 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java
@@ -3,6 +3,7 @@
  */

 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries;

 

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;

 import java.util.Arrays;

 import java.util.Collection;

 import java.util.LinkedHashSet;

@@ -40,8 +41,8 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 

  * <p>Original source:

  *         <code><pre>

- *         pattern VLSFunctionFof(term: VLSFunctionFof){

- *              VLSFunctionFof(term);

+ *         pattern VLSFunctionFof(term: VLSFunctionAsTerm){

+ *              VLSFunctionAsTerm(term);

  *         }

  * </pre></code>

  * 

@@ -64,11 +65,11 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
    * 

    */

   public static abstract class Match extends BasePatternMatch {

-    private ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof fTerm;

+    private VLSFunctionAsTerm fTerm;

     

     private static List<String> parameterNames = makeImmutableList("term");

     

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    private Match(final VLSFunctionAsTerm pTerm) {

       this.fTerm = pTerm;

     }

     

@@ -78,7 +79,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
       return null;

     }

     

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof getTerm() {

+    public VLSFunctionAsTerm getTerm() {

       return this.fTerm;

     }

     

@@ -86,13 +87,13 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
     public boolean set(final String parameterName, final Object newValue) {

       if (!isMutable()) throw new java.lang.UnsupportedOperationException();

       if ("term".equals(parameterName) ) {

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) newValue;

+          this.fTerm = (VLSFunctionAsTerm) newValue;

           return true;

       }

       return false;

     }

     

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public void setTerm(final VLSFunctionAsTerm pTerm) {

       if (!isMutable()) throw new java.lang.UnsupportedOperationException();

       this.fTerm = pTerm;

     }

@@ -173,7 +174,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the new, mutable (partial) match object.

      * 

      */

-    public static VLSFunctionFof.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public static VLSFunctionFof.Match newMutableMatch(final VLSFunctionAsTerm pTerm) {

       return new Mutable(pTerm);

     }

     

@@ -185,12 +186,12 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the (partial) match object.

      * 

      */

-    public static VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public static VLSFunctionFof.Match newMatch(final VLSFunctionAsTerm pTerm) {

       return new Immutable(pTerm);

     }

     

     private static final class Mutable extends VLSFunctionFof.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+      Mutable(final VLSFunctionAsTerm pTerm) {

         super(pTerm);

       }

       

@@ -201,7 +202,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
     }

     

     private static final class Immutable extends VLSFunctionFof.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+      Immutable(final VLSFunctionAsTerm pTerm) {

         super(pTerm);

       }

       

@@ -223,8 +224,8 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
    * 

    * <p>Original source:

    * <code><pre>

-   * pattern VLSFunctionFof(term: VLSFunctionFof){

-   *    VLSFunctionFof(term);

+   * pattern VLSFunctionFof(term: VLSFunctionAsTerm){

+   *    VLSFunctionAsTerm(term);

    * }

    * </pre></code>

    * 

@@ -282,7 +283,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return matches represented as a Match object.

      * 

      */

-    public Collection<VLSFunctionFof.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public Collection<VLSFunctionFof.Match> getAllMatches(final VLSFunctionAsTerm pTerm) {

       return rawStreamAllMatches(new Object[]{pTerm}).collect(Collectors.toSet());

     }

     

@@ -296,7 +297,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return a stream of matches represented as a Match object.

      * 

      */

-    public Stream<VLSFunctionFof.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public Stream<VLSFunctionFof.Match> streamAllMatches(final VLSFunctionAsTerm pTerm) {

       return rawStreamAllMatches(new Object[]{pTerm});

     }

     

@@ -307,7 +308,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return a match represented as a Match object, or null if no match is found.

      * 

      */

-    public Optional<VLSFunctionFof.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public Optional<VLSFunctionFof.Match> getOneArbitraryMatch(final VLSFunctionAsTerm pTerm) {

       return rawGetOneArbitraryMatch(new Object[]{pTerm});

     }

     

@@ -318,7 +319,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return true if the input is a valid (partial) match of the pattern.

      * 

      */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public boolean hasMatch(final VLSFunctionAsTerm pTerm) {

       return rawHasMatch(new Object[]{pTerm});

     }

     

@@ -328,7 +329,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the number of pattern matches found.

      * 

      */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public int countMatches(final VLSFunctionAsTerm pTerm) {

       return rawCountMatches(new Object[]{pTerm});

     }

     

@@ -340,7 +341,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

      * 

      */

-    public boolean forOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm, final Consumer<? super VLSFunctionFof.Match> processor) {

+    public boolean forOneArbitraryMatch(final VLSFunctionAsTerm pTerm, final Consumer<? super VLSFunctionFof.Match> processor) {

       return rawForOneArbitraryMatch(new Object[]{pTerm}, processor);

     }

     

@@ -352,7 +353,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the (partial) match object.

      * 

      */

-    public VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

+    public VLSFunctionFof.Match newMatch(final VLSFunctionAsTerm pTerm) {

       return VLSFunctionFof.Match.newMatch(pTerm);

     }

     

@@ -361,8 +362,8 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the Set of all values or empty set if there are no matches

      * 

      */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof.class::cast);

+    protected Stream<VLSFunctionAsTerm> rawStreamAllValuesOfterm(final Object[] parameters) {

+      return rawStreamAllValues(POSITION_TERM, parameters).map(VLSFunctionAsTerm.class::cast);

     }

     

     /**

@@ -370,7 +371,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the Set of all values or empty set if there are no matches

      * 

      */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> getAllValuesOfterm() {

+    public Set<VLSFunctionAsTerm> getAllValuesOfterm() {

       return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

     }

     

@@ -379,14 +380,14 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
      * @return the Set of all values or empty set if there are no matches

      * 

      */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> streamAllValuesOfterm() {

+    public Stream<VLSFunctionAsTerm> streamAllValuesOfterm() {

       return rawStreamAllValuesOfterm(emptyArray());

     }

     

     @Override

     protected VLSFunctionFof.Match tupleToMatch(final Tuple t) {

       try {

-          return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) t.get(POSITION_TERM));

+          return VLSFunctionFof.Match.newMatch((VLSFunctionAsTerm) t.get(POSITION_TERM));

       } catch(ClassCastException e) {

           LOGGER.error("Element(s) in tuple not properly typed!",e);

           return null;

@@ -396,7 +397,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
     @Override

     protected VLSFunctionFof.Match arrayToMatch(final Object[] match) {

       try {

-          return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]);

+          return VLSFunctionFof.Match.newMatch((VLSFunctionAsTerm) match[POSITION_TERM]);

       } catch(ClassCastException e) {

           LOGGER.error("Element(s) in array not properly typed!",e);

           return null;

@@ -406,7 +407,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
     @Override

     protected VLSFunctionFof.Match arrayToMatchMutable(final Object[] match) {

       try {

-          return VLSFunctionFof.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]);

+          return VLSFunctionFof.Match.newMutableMatch((VLSFunctionAsTerm) match[POSITION_TERM]);

       } catch(ClassCastException e) {

           LOGGER.error("Element(s) in array not properly typed!",e);

           return null;

@@ -457,7 +458,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
   

   @Override

   public VLSFunctionFof.Match newMatch(final Object... parameters) {

-    return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) parameters[0]);

+    return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm) parameters[0]);

   }

   

   /**

@@ -489,7 +490,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

     private final static VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery();

     

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")), PParameterDirection.INOUT);

+    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")), PParameterDirection.INOUT);

     

     private final List<PParameter> parameters = Arrays.asList(parameter_term);

     

@@ -519,12 +520,12 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS
       {

           PBody body = new PBody(this);

           PVariable var_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")));

+          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")));

           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

              new ExportedParameter(body, var_term, parameter_term)

           ));

-          //    VLSFunctionFof(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")));

+          //    VLSFunctionAsTerm(term)

+          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")));

           bodies.add(body);

       }

       return bodies;

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
index 3c672f4b..22bd4ab5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
@@ -1,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
 
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
@@ -13,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable
 import java.util.HashMap
+import java.util.List
 import java.util.Map
 
 interface Logic2VampireLanguageMapper_TypeMapperTrace {}
@@ -32,6 +34,9 @@ class Logic2VampireLanguageMapperTrace {
         public val Map<DefinedElement, VLSFunction> element2Predicate = new HashMap
         public val Map<Type, VLSTerm> type2PossibleNot = new HashMap
         public val Map<Type, VLSTerm> type2And = new HashMap
+        //Uniqueness
+        public val List<VLSConstant> uniqueInstances = newArrayList
+        
         
         public var Map<ConstantDeclaration, ConstantDefinition> constantDefinitions
         public var Map<RelationDeclaration, RelationDefinition> relationDefinitions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
index 4b7ea3d0..e5dfbf08 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -19,13 +19,14 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                 val VLSVariable variable = createVLSVariable => [it.name = "A"]

 

                 // 1. make a list of constants equaling the min number of specified objects

-                val List<VLSConstant> instances = newArrayList

+                val localInstances = newArrayList

                 for (var i = 0; i < config.typeScopes.minNewElements; i++) {

                         val num = i + 1

                         val cst = createVLSConstant => [

                                 it.name = "o" + num

                         ]

-                        instances.add(cst)

+                        trace.uniqueInstances.add(cst)

+                        localInstances.add(cst)

                 }

 

                 // TODO: specify for the max

@@ -37,14 +38,14 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                                 it.fofFormula = createVLSUniversalQuantifier => [

                                         it.variables += support.duplicate(variable)

                                         // check below

-                                        it.operand = createVLSEquivalent => [

-                                                it.left = support.topLevelTypeFunc

-                                                it.right = support.unfoldOr(instances.map [ i |

+                                        it.operand = createVLSImplies => [

+                                                it.left = support.unfoldOr(localInstances.map [ i |

                                                         createVLSEquality => [

                                                                 it.left = createVLSVariable => [it.name = variable.name]

                                                                 it.right = i

                                                         ]

                                                 ])

+                                                it.right = support.topLevelTypeFunc

                                         ]

                                 ]

                         ]

@@ -55,7 +56,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                         val uniqueness = createVLSFofFormula => [

                                 it.name = "typeUniqueness"

                                 it.fofRole = "axiom"

-                                it.fofFormula = support.establishUniqueness(instances)

+                                it.fofFormula = support.establishUniqueness(trace.uniqueInstances)

                         ]

                         trace.specification.formulas += uniqueness

                 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
index d3595a73..021cb0ea 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
 
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable
@@ -36,6 +37,14 @@ class Logic2VampireLanguageMapper_Support {
         def protected VLSVariable duplicate(VLSVariable term) {
                 return createVLSVariable => [it.name = term.name]
         }
+        
+        def protected VLSFunctionAsTerm duplicate(VLSFunctionAsTerm term) {
+                return createVLSFunctionAsTerm => [it.functor = term.functor]
+        }
+        
+        def protected VLSConstant duplicate(VLSConstant term) {
+                return createVLSConstant => [it.name = term.name]
+        }
 
         def protected VLSFunction duplicate(VLSFunction term) {
                 return createVLSFunction => [
@@ -52,6 +61,19 @@ class Logic2VampireLanguageMapper_Support {
                         it.terms += duplicate(v)
                 ]
         }
+        
+        def protected VLSFunction duplicate(VLSFunction term, VLSFunctionAsTerm v) {
+                return createVLSFunction => [
+                        it.constant = term.constant
+                        it.terms += duplicate(v)
+                ]
+        }
+        
+        def protected VLSConstant toConstant(VLSFunctionAsTerm term) {
+                return createVLSConstant => [
+                        it.name = term.functor
+                ]
+        }
 
         def protected VLSFunction topLevelTypeFunc() {
                 return createVLSFunction => [
@@ -61,6 +83,13 @@ class Logic2VampireLanguageMapper_Support {
                         ]
                 ]
         }
+        
+        def protected VLSFunction topLevelTypeFunc(VLSFunctionAsTerm v) {
+                return createVLSFunction => [
+                        it.constant = "object"
+                        it.terms += duplicate(v)
+                ]
+        }
 
         // TODO Make more general
         def establishUniqueness(List<VLSConstant> terms) {
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
index bc0b3e23..f2a7b3f2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
@@ -14,8 +14,9 @@ import java.util.Collection
 import java.util.List
 
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
+import java.util.Collections
 
-class Logic2VampireLanguageMapper_TypeMapper  {
+class Logic2VampireLanguageMapper_TypeMapper {
         private val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE
         private val Logic2VampireLanguageMapper_Support support = new Logic2VampireLanguageMapper_Support
         val Logic2VampireLanguageMapper base
@@ -25,8 +26,9 @@ class Logic2VampireLanguageMapper_TypeMapper  {
                 this.base = base
         }
 
-        def protected transformTypes(Collection<Type> types, Collection<DefinedElement> elements, Logic2VampireLanguageMapper mapper, Logic2VampireLanguageMapperTrace trace) {
-                
+        def protected transformTypes(Collection<Type> types, Collection<DefinedElement> elements,
+                Logic2VampireLanguageMapper mapper, Logic2VampireLanguageMapperTrace trace) {
+
 //              val typeTrace = new Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes
 //              trace.typeMapperTrace = typeTrace
                 val VLSVariable variable = createVLSVariable => [it.name = "A"]
@@ -86,14 +88,38 @@ class Logic2VampireLanguageMapper_TypeMapper  {
 
                         ]
                         trace.specification.formulas += res
+
+                        // Create objects for the enum elements
+                        val List<VLSFunction> enumScopeElems = newArrayList
+                        for (var i = 0; i < type.elements.length; i++) {
+                                val num = i + 1
+                                val cstTerm = createVLSFunctionAsTerm => [
+                                        it.functor = "eo" + num
+                                ]
+                                val cst = support.toConstant(cstTerm)
+                                trace.uniqueInstances.add(cst)
+                                val fct = support.duplicate(type.elements.get(i).lookup(trace.element2Predicate), cstTerm)
+                                enumScopeElems.add(fct)
+//                              enumScopeElems.add(support.topLevelTypeFunc(cstTerm))
+                        }
+                        
+                        
+                        
+                        val enumScope = createVLSFofFormula => [
+                                it.name = support.toIDMultiple("enumScope", type.name.split(" ").get(0))
+                                // below is temporary solution
+                                it.fofRole = "axiom"                    
+                                it.fofFormula = support.unfoldAnd(enumScopeElems)
+                        ]
+                        
+                        trace.specification.formulas += enumScope
                 }
-                
-                //HIERARCHY HANDLER
-                
-                
+
+                // HIERARCHY HANDLER
                 // 3. For each non-abstract type, create an and sequence containing all typedeclaration predicates
                 // and store in a map
-                for (t1 : types.filter[!isIsAbstract]) {
+//              println(types.filter[!isIsAbstract])
+                for (t1 : types.filter[!isIsAbstract].filter(TypeDeclaration)) {
                         for (t2 : types) {
                                 // possible improvement: check all supertypes and decide if negated or not based on negations/not negations of supertypes
                                 if (t1 == t2 || support.dfsSupertypeCheck(t1, t2)) {
@@ -121,7 +147,9 @@ class Logic2VampireLanguageMapper_TypeMapper  {
                                 it.operand = createVLSEquivalent => [
                                         it.left = support.topLevelTypeFunc
 //                                      it.right = support.unfoldOr(new ArrayList<VLSTerm>(typeTrace.type2And.values))
-                                        it.right = support.unfoldOr(new ArrayList<VLSTerm>(trace.type2And.values))
+                                        val reversedList = new ArrayList<VLSTerm>(trace.type2And.values)
+//                                      Collections.reverse(reversedList)
+                                        it.right = support.unfoldOr(reversedList)
                                 ]
                         ]
                 ]
@@ -130,7 +158,7 @@ class Logic2VampireLanguageMapper_TypeMapper  {
 
         }
 
-        //below are from previous interface
+        // below are from previous interface
         def protected transformTypeReference(Type referred, Logic2VampireLanguageMapper mapper,
                 Logic2VampireLanguageMapperTrace trace) {
                 throw new UnsupportedOperationException("TODO: auto-generated method stub")
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index e0766c08..3f204913 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index c38c96ad..10983f27 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 2c091b47..00ebca4b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index b05fd2c1..9641858d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index 7f6519eb..2b51fe5d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index d30eebe5..75482abc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index 921b79bd..c394f878 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index 6b8d1dc0..1ec5da80 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index 83e57283..e85b5240 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index 5a0087bc..c000d128 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index 7d090297..5eb63977 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
index c8ab54c2..501dbfb4 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
index 3306fa73..621c888a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
index 2b491209..24df5fcd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
@@ -1,6 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;

 

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_TypeMapperTrace;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

@@ -14,7 +15,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;

 import java.util.HashMap;

+import java.util.List;

 import java.util.Map;

+import org.eclipse.xtext.xbase.lib.CollectionLiterals;

 

 @SuppressWarnings("all")

 public class Logic2VampireLanguageMapperTrace {

@@ -34,6 +37,8 @@ public class Logic2VampireLanguageMapperTrace {
   

   public final Map<Type, VLSTerm> type2And = new HashMap<Type, VLSTerm>();

   

+  public final List<VLSConstant> uniqueInstances = CollectionLiterals.<VLSConstant>newArrayList();

+  

   public Map<ConstantDeclaration, ConstantDefinition> constantDefinitions;

   

   public Map<RelationDeclaration, RelationDefinition> relationDefinitions;

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
index 8967839d..15ba78c9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
@@ -5,13 +5,14 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguage
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquality;

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration;

-import java.util.List;

+import java.util.ArrayList;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.xtext.xbase.lib.CollectionLiterals;

 import org.eclipse.xtext.xbase.lib.Extension;

@@ -39,7 +40,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
       it.setName("A");

     };

     final VLSVariable variable = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function);

-    final List<VLSConstant> instances = CollectionLiterals.<VLSConstant>newArrayList();

+    final ArrayList<VLSTerm> localInstances = CollectionLiterals.<VLSTerm>newArrayList();

     for (int i = 0; (i < config.typeScopes.minNewElements); i++) {

       {

         final int num = (i + 1);

@@ -48,7 +49,8 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
           it.setName(("o" + Integer.valueOf(num)));

         };

         final VLSConstant cst = ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function_1);

-        instances.add(cst);

+        trace.uniqueInstances.add(cst);

+        localInstances.add(cst);

       }

     }

     if ((config.typeScopes.minNewElements != 0)) {

@@ -61,10 +63,9 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
           EList<VLSVariable> _variables = it_1.getVariables();

           VLSVariable _duplicate = this.support.duplicate(variable);

           _variables.add(_duplicate);

-          VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

-          final Procedure1<VLSEquivalent> _function_3 = (VLSEquivalent it_2) -> {

-            it_2.setLeft(this.support.topLevelTypeFunc());

-            final Function1<VLSConstant, VLSEquality> _function_4 = (VLSConstant i) -> {

+          VLSImplies _createVLSImplies = this.factory.createVLSImplies();

+          final Procedure1<VLSImplies> _function_3 = (VLSImplies it_2) -> {

+            final Function1<VLSTerm, VLSEquality> _function_4 = (VLSTerm i) -> {

               VLSEquality _createVLSEquality = this.factory.createVLSEquality();

               final Procedure1<VLSEquality> _function_5 = (VLSEquality it_3) -> {

                 VLSVariable _createVLSVariable_1 = this.factory.createVLSVariable();

@@ -77,9 +78,10 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
               };

               return ObjectExtensions.<VLSEquality>operator_doubleArrow(_createVLSEquality, _function_5);

             };

-            it_2.setRight(this.support.unfoldOr(ListExtensions.<VLSConstant, VLSEquality>map(instances, _function_4)));

+            it_2.setLeft(this.support.unfoldOr(ListExtensions.<VLSTerm, VLSEquality>map(localInstances, _function_4)));

+            it_2.setRight(this.support.topLevelTypeFunc());

           };

-          VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_3);

+          VLSImplies _doubleArrow = ObjectExtensions.<VLSImplies>operator_doubleArrow(_createVLSImplies, _function_3);

           it_1.setOperand(_doubleArrow);

         };

         VLSUniversalQuantifier _doubleArrow = ObjectExtensions.<VLSUniversalQuantifier>operator_doubleArrow(_createVLSUniversalQuantifier, _function_2);

@@ -92,7 +94,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
       final Procedure1<VLSFofFormula> _function_2 = (VLSFofFormula it) -> {

         it.setName("typeUniqueness");

         it.setFofRole("axiom");

-        it.setFofFormula(this.support.establishUniqueness(instances));

+        it.setFofFormula(this.support.establishUniqueness(trace.uniqueInstances));

       };

       final VLSFofFormula uniqueness = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_2);

       EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas();

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
index 72ca44e9..e2ff7a0e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
@@ -6,6 +6,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr;

@@ -62,6 +63,22 @@ public class Logic2VampireLanguageMapper_Support {
     return ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function);

   }

   

+  protected VLSFunctionAsTerm duplicate(final VLSFunctionAsTerm term) {

+    VLSFunctionAsTerm _createVLSFunctionAsTerm = this.factory.createVLSFunctionAsTerm();

+    final Procedure1<VLSFunctionAsTerm> _function = (VLSFunctionAsTerm it) -> {

+      it.setFunctor(term.getFunctor());

+    };

+    return ObjectExtensions.<VLSFunctionAsTerm>operator_doubleArrow(_createVLSFunctionAsTerm, _function);

+  }

+  

+  protected VLSConstant duplicate(final VLSConstant term) {

+    VLSConstant _createVLSConstant = this.factory.createVLSConstant();

+    final Procedure1<VLSConstant> _function = (VLSConstant it) -> {

+      it.setName(term.getName());

+    };

+    return ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function);

+  }

+  

   protected VLSFunction duplicate(final VLSFunction term) {

     VLSFunction _createVLSFunction = this.factory.createVLSFunction();

     final Procedure1<VLSFunction> _function = (VLSFunction it) -> {

@@ -87,6 +104,25 @@ public class Logic2VampireLanguageMapper_Support {
     return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function);

   }

   

+  protected VLSFunction duplicate(final VLSFunction term, final VLSFunctionAsTerm v) {

+    VLSFunction _createVLSFunction = this.factory.createVLSFunction();

+    final Procedure1<VLSFunction> _function = (VLSFunction it) -> {

+      it.setConstant(term.getConstant());

+      EList<VLSTerm> _terms = it.getTerms();

+      VLSFunctionAsTerm _duplicate = this.duplicate(v);

+      _terms.add(_duplicate);

+    };

+    return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function);

+  }

+  

+  protected VLSConstant toConstant(final VLSFunctionAsTerm term) {

+    VLSConstant _createVLSConstant = this.factory.createVLSConstant();

+    final Procedure1<VLSConstant> _function = (VLSConstant it) -> {

+      it.setName(term.getFunctor());

+    };

+    return ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function);

+  }

+  

   protected VLSFunction topLevelTypeFunc() {

     VLSFunction _createVLSFunction = this.factory.createVLSFunction();

     final Procedure1<VLSFunction> _function = (VLSFunction it) -> {

@@ -102,6 +138,17 @@ public class Logic2VampireLanguageMapper_Support {
     return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function);

   }

   

+  protected VLSFunction topLevelTypeFunc(final VLSFunctionAsTerm v) {

+    VLSFunction _createVLSFunction = this.factory.createVLSFunction();

+    final Procedure1<VLSFunction> _function = (VLSFunction it) -> {

+      it.setConstant("object");

+      EList<VLSTerm> _terms = it.getTerms();

+      VLSFunctionAsTerm _duplicate = this.duplicate(v);

+      _terms.add(_duplicate);

+    };

+    return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function);

+  }

+  

   public VLSTerm establishUniqueness(final List<VLSConstant> terms) {

     final List<VLSInequality> eqs = CollectionLiterals.<VLSInequality>newArrayList();

     List<VLSConstant> _subList = terms.subList(1, ((Object[])Conversions.unwrapArray(terms, Object.class)).length);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
index d3dddcfc..f776371b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
@@ -3,10 +3,12 @@ package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDoubleQuote;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

@@ -16,6 +18,7 @@ import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;

 import hu.bme.mit.inf.dslreasoner.util.CollectionsUtil;

@@ -24,6 +27,7 @@ import java.util.Collection;
 import java.util.List;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.xtext.xbase.lib.CollectionLiterals;

+import org.eclipse.xtext.xbase.lib.Conversions;

 import org.eclipse.xtext.xbase.lib.Extension;

 import org.eclipse.xtext.xbase.lib.Functions.Function1;

 import org.eclipse.xtext.xbase.lib.IterableExtensions;

@@ -107,14 +111,38 @@ public class Logic2VampireLanguageMapper_TypeMapper {
           final VLSFofFormula res = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula, _function_1);

           EList<VLSFofFormula> _formulas = trace.specification.getFormulas();

           _formulas.add(res);

+          final List<VLSFunction> enumScopeElems = CollectionLiterals.<VLSFunction>newArrayList();

+          for (int i = 0; (i < ((Object[])Conversions.unwrapArray(type_1.getElements(), Object.class)).length); i++) {

+            {

+              final int num = (i + 1);

+              VLSFunctionAsTerm _createVLSFunctionAsTerm = this.factory.createVLSFunctionAsTerm();

+              final Procedure1<VLSFunctionAsTerm> _function_2 = (VLSFunctionAsTerm it) -> {

+                it.setFunctor(("eo" + Integer.valueOf(num)));

+              };

+              final VLSFunctionAsTerm cstTerm = ObjectExtensions.<VLSFunctionAsTerm>operator_doubleArrow(_createVLSFunctionAsTerm, _function_2);

+              final VLSConstant cst = this.support.toConstant(cstTerm);

+              trace.uniqueInstances.add(cst);

+              final VLSFunction fct = this.support.duplicate(CollectionsUtil.<DefinedElement, VLSFunction>lookup(type_1.getElements().get(i), trace.element2Predicate), cstTerm);

+              enumScopeElems.add(fct);

+            }

+          }

+          VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

+          final Procedure1<VLSFofFormula> _function_2 = (VLSFofFormula it) -> {

+            it.setName(this.support.toIDMultiple("enumScope", type_1.getName().split(" ")[0]));

+            it.setFofRole("axiom");

+            it.setFofFormula(this.support.unfoldAnd(enumScopeElems));

+          };

+          final VLSFofFormula enumScope = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_2);

+          EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas();

+          _formulas_1.add(enumScope);

         }

       }

       final Function1<Type, Boolean> _function_1 = (Type it) -> {

         boolean _isIsAbstract = it.isIsAbstract();

         return Boolean.valueOf((!_isIsAbstract));

       };

-      Iterable<Type> _filter_1 = IterableExtensions.<Type>filter(types, _function_1);

-      for (final Type t1 : _filter_1) {

+      Iterable<TypeDeclaration> _filter_1 = Iterables.<TypeDeclaration>filter(IterableExtensions.<Type>filter(types, _function_1), TypeDeclaration.class);

+      for (final TypeDeclaration t1 : _filter_1) {

         {

           for (final Type t2 : types) {

             if ((Objects.equal(t1, t2) || this.support.dfsSupertypeCheck(t1, t2))) {

@@ -147,8 +175,8 @@ public class Logic2VampireLanguageMapper_TypeMapper {
           final Procedure1<VLSEquivalent> _function_4 = (VLSEquivalent it_2) -> {

             it_2.setLeft(this.support.topLevelTypeFunc());

             Collection<VLSTerm> _values = trace.type2And.values();

-            ArrayList<VLSTerm> _arrayList = new ArrayList<VLSTerm>(_values);

-            it_2.setRight(this.support.unfoldOr(_arrayList));

+            final ArrayList<VLSTerm> reversedList = new ArrayList<VLSTerm>(_values);

+            it_2.setRight(this.support.unfoldOr(reversedList));

           };

           VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_4);

           it_1.setOperand(_doubleArrow);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
index 4bc4628b..c492b66d 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
@@ -1,8 +1,9 @@
 % This is an initial Test Comment

 fof ( typeDef_FunctionType , axiom , ! [ A ] : ( t_FunctionType ( A ) <=> ( e_Root_FunctionType ( A ) | ( e_Intermediate_FunctionType ( A ) | e_Leaf_FunctionType ( A ) ) ) ) ) .

-fof ( hierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( t_InformationLink ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_Function ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( t_FunctionalData ( A ) & t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( typeScope , axiom , ! [ A ] : ( object ( A ) <=> ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | A = o5 ) ) ) ) ) ) .

-fof ( typeUniqueness , axiom , o1 != o2 & ( o1 != o3 & ( o2 != o3 & ( o1 != o4 & ( o2 != o4 & ( o3 != o4 & ( o1 != o5 & ( o2 != o5 & ( o3 != o5 & o4 != o5 ) ) ) ) ) ) ) ) ) .

+fof ( enumScope_FunctionType , axiom , e_Root_FunctionType ( eo1 ) & ( e_Intermediate_FunctionType ( eo2 ) & e_Leaf_FunctionType ( eo3 ) ) ) .

+fof ( hierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FunctionalData ( A ) & ( t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ( t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ~ t_Function ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInput ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & t_Function ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

+fof ( typeScope , axiom , ! [ A ] : ( ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | A = o5 ) ) ) ) => object ( A ) ) ) .

+fof ( typeUniqueness , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo2 != eo3 & ( eo1 != o1 & ( eo2 != o1 & ( eo3 != o1 & ( eo1 != o2 & ( eo2 != o2 & ( eo3 != o2 & ( o1 != o2 & ( eo1 != o3 & ( eo2 != o3 & ( eo3 != o3 & ( o1 != o3 & ( o2 != o3 & ( eo1 != o4 & ( eo2 != o4 & ( eo3 != o4 & ( o1 != o4 & ( o2 != o4 & ( o3 != o4 & ( eo1 != o5 & ( eo2 != o5 & ( eo3 != o5 & ( o1 != o5 & ( o2 != o5 & ( o3 != o5 & o4 != o5 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

 fof ( compliance_interface_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .

 fof ( compliance_model_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_model_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalArchitectureModel ( V_1 ) ) ) ) .

 fof ( compliance_parent_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_parent_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_Function ( V_1 ) ) ) ) .

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 446cfded..c9fd4467 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index 867fe276..120f7cbb 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index fa2a2fc1..3669124b 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index 26cbd485..71eec0ad 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin