diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/AqlCompilationProvider.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/AqlCompilationProvider.java
index 662010f..4a6735a 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/AqlCompilationProvider.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/AqlCompilationProvider.java
@@ -21,7 +21,7 @@
 import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory;
 import org.apache.asterix.algebra.base.ILangExtension;
 import org.apache.asterix.lang.aql.parser.AQLParserFactory;
-import org.apache.asterix.lang.aql.rewrites.AQLRewriterFactory;
+import org.apache.asterix.lang.aql.rewrites.AqlRewriterFactory;
 import org.apache.asterix.lang.aql.visitor.AQLAstPrintVisitorFactory;
 import org.apache.asterix.lang.common.base.IAstPrintVisitorFactory;
 import org.apache.asterix.lang.common.base.IParserFactory;
@@ -42,7 +42,7 @@
 
     @Override
     public IRewriterFactory getRewriterFactory() {
-        return new AQLRewriterFactory(getParserFactory());
+        return new AqlRewriterFactory(getParserFactory());
     }
 
     @Override
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
index 0f8a790..5cc30f3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
@@ -891,8 +891,7 @@
     private AbstractFunctionCallExpression lookupUserDefinedFunction(FunctionSignature signature,
             List<Mutable<ILogicalExpression>> args, SourceLocation sourceLoc) throws CompilationException {
         try {
-            Function function =
-                    FunctionUtil.lookupUserDefinedFunctionDecl(metadataProvider.getMetadataTxnContext(), signature);
+            Function function = metadataProvider.lookupUserDefinedFunction(signature);
             if (function == null) {
                 return null;
             }
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
index a3593d5..89f513b 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
@@ -187,7 +187,7 @@
             generateExpressionTree(q);
         }
         IQueryRewriter rw = rewriterFactory.createQueryRewriter();
-        rw.rewrite(declaredFunctions, q, metadataProvider,
+        rw.rewrite(new ArrayList<>(declaredFunctions), q, metadataProvider,
                 new LangRewritingContext(q.getVarCounter(), warningCollector), inlineUdfs, externalVars);
         return new Pair<>(q, q.getVarCounter());
     }
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index b3b55a8..b2477a4 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -267,7 +267,7 @@
         this.sessionOutput = output;
         this.sessionConfig = output.config();
         this.compilationProvider = compilationProvider;
-        declaredFunctions = getDeclaredFunctions(statements);
+        declaredFunctions = new ArrayList<>();
         apiFramework = new APIFramework(compilationProvider);
         rewriterFactory = compilationProvider.getRewriterFactory();
         activeDataverse = MetadataBuiltinEntities.DEFAULT_DATAVERSE;
@@ -283,16 +283,6 @@
         return sessionOutput;
     }
 
-    protected List<FunctionDecl> getDeclaredFunctions(List<Statement> statements) {
-        List<FunctionDecl> functionDecls = new ArrayList<>();
-        for (Statement st : statements) {
-            if (st.getKind() == Statement.Kind.FUNCTION_DECL) {
-                functionDecls.add((FunctionDecl) st);
-            }
-        }
-        return functionDecls;
-    }
-
     @Override
     public void compileAndExecute(IHyracksClientConnection hcc, IRequestParameters requestParameters) throws Exception {
         validateStatements(requestParameters);
@@ -450,7 +440,7 @@
                         outputFile = result.second;
                         break;
                     case FUNCTION_DECL:
-                        // No op
+                        handleDeclareFunctionStatement(stmt);
                         break;
                     case EXTENSION:
                         final ExtensionStatement extStmt = (ExtensionStatement) stmt;
@@ -1939,6 +1929,13 @@
         }
     }
 
+    protected void handleDeclareFunctionStatement(Statement stmt) {
+        FunctionDecl fds = (FunctionDecl) stmt;
+        FunctionSignature signature = fds.getSignature();
+        signature.setDataverseName(getActiveDataverseName(signature.getDataverseName()));
+        declaredFunctions.add(fds);
+    }
+
     protected void handleCreateFunctionStatement(MetadataProvider metadataProvider, Statement stmt,
             IStatementRewriter stmtRewriter) throws Exception {
         CreateFunctionStatement cfs = (CreateFunctionStatement) stmt;
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
index c454993..8b6f05f 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
@@ -29,11 +29,14 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.asterix.common.config.GlobalConfig;
 import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
 import org.apache.asterix.common.metadata.DataverseName;
 import org.apache.asterix.lang.common.base.IParser;
 import org.apache.asterix.lang.common.base.IParserFactory;
@@ -41,6 +44,7 @@
 import org.apache.asterix.lang.common.base.IRewriterFactory;
 import org.apache.asterix.lang.common.base.Statement;
 import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
+import org.apache.asterix.lang.common.statement.CreateFunctionStatement;
 import org.apache.asterix.lang.common.statement.DataverseDecl;
 import org.apache.asterix.lang.common.statement.FunctionDecl;
 import org.apache.asterix.lang.common.statement.Query;
@@ -52,6 +56,8 @@
 import org.apache.asterix.metadata.bootstrap.MetadataBuiltinEntities;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.asterix.metadata.entities.Dataverse;
+import org.apache.asterix.metadata.entities.Function;
 import org.apache.asterix.test.common.ComparisonException;
 import org.apache.asterix.test.common.TestExecutor;
 import org.apache.asterix.testframework.context.TestCaseContext;
@@ -70,6 +76,7 @@
 
     private IParserFactory sqlppParserFactory = new SqlppParserFactory();
     private IRewriterFactory sqlppRewriterFactory = new SqlppRewriterFactory(sqlppParserFactory);
+    private Set<FunctionSignature> createdFunctions = new HashSet<>();
 
     @Override
     public void executeTest(String actualPath, TestCaseContext testCaseCtx, ProcessBuilder pb,
@@ -130,8 +137,11 @@
         GlobalConfig.ASTERIX_LOGGER.info(queryFile.toString());
         try {
             List<Statement> statements = parser.parse();
-            List<FunctionDecl> functions = getDeclaredFunctions(statements);
             DataverseName dvName = getDefaultDataverse(statements);
+            List<FunctionDecl> functions = getDeclaredFunctions(statements, dvName);
+            List<FunctionSignature> createdFunctionsList = getCreatedFunctions(statements, dvName);
+            createdFunctions.addAll(createdFunctionsList);
+
             MetadataProvider metadataProvider = mock(MetadataProvider.class);
 
             @SuppressWarnings("unchecked")
@@ -139,6 +149,15 @@
             when(metadataProvider.getDefaultDataverseName()).thenReturn(dvName);
             when(metadataProvider.getConfig()).thenReturn(config);
             when(config.get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS)).thenReturn("true");
+            when(metadataProvider.findDataverse(any(DataverseName.class))).thenAnswer(new Answer<Dataverse>() {
+                @Override
+                public Dataverse answer(InvocationOnMock invocation) {
+                    Object[] args = invocation.getArguments();
+                    final Dataverse mockDataverse = mock(Dataverse.class);
+                    when(mockDataverse.getDataverseName()).thenReturn((DataverseName) args[0]);
+                    return mockDataverse;
+                }
+            });
             when(metadataProvider.findDataset(any(DataverseName.class), anyString())).thenAnswer(new Answer<Dataset>() {
                 @Override
                 public Dataset answer(InvocationOnMock invocation) {
@@ -149,6 +168,20 @@
                     return mockDataset;
                 }
             });
+            when(metadataProvider.lookupUserDefinedFunction(any(FunctionSignature.class)))
+                    .thenAnswer(new Answer<Function>() {
+                        @Override
+                        public Function answer(InvocationOnMock invocation) {
+                            Object[] args = invocation.getArguments();
+                            FunctionSignature fs = (FunctionSignature) args[0];
+                            if (!createdFunctions.contains(fs)) {
+                                return null;
+                            }
+                            Function mockFunction = mock(Function.class);
+                            when(mockFunction.getSignature()).thenReturn(fs);
+                            return mockFunction;
+                        }
+                    });
 
             for (Statement st : statements) {
                 if (st.getKind() == Statement.Kind.QUERY) {
@@ -177,16 +210,38 @@
     }
 
     // Extracts declared functions.
-    private List<FunctionDecl> getDeclaredFunctions(List<Statement> statements) {
-        List<FunctionDecl> functionDecls = new ArrayList<FunctionDecl>();
+    private List<FunctionDecl> getDeclaredFunctions(List<Statement> statements, DataverseName defaultDataverseName) {
+        List<FunctionDecl> functionDecls = new ArrayList<>();
         for (Statement st : statements) {
             if (st.getKind() == Statement.Kind.FUNCTION_DECL) {
-                functionDecls.add((FunctionDecl) st);
+                FunctionDecl fds = (FunctionDecl) st;
+                FunctionSignature signature = fds.getSignature();
+                if (signature.getDataverseName() == null) {
+                    signature.setDataverseName(defaultDataverseName);
+                }
+                functionDecls.add(fds);
             }
         }
         return functionDecls;
     }
 
+    // Extracts created functions.
+    private List<FunctionSignature> getCreatedFunctions(List<Statement> statements,
+            DataverseName defaultDataverseName) {
+        List<FunctionSignature> createdFunctions = new ArrayList<>();
+        for (Statement st : statements) {
+            if (st.getKind() == Statement.Kind.CREATE_FUNCTION) {
+                CreateFunctionStatement cfs = (CreateFunctionStatement) st;
+                FunctionSignature signature = cfs.getFunctionSignature();
+                if (signature.getDataverseName() == null) {
+                    signature = new FunctionSignature(defaultDataverseName, signature.getName(), signature.getArity());
+                }
+                createdFunctions.add(signature);
+            }
+        }
+        return createdFunctions;
+    }
+
     // Gets the default dataverse for the input statements.
     private DataverseName getDefaultDataverse(List<Statement> statements) {
         for (Statement st : statements) {
@@ -208,14 +263,19 @@
                         + "org.apache.asterix.metadata.declared.MetadataProvider, "
                         + "org.apache.asterix.lang.common.rewrites.LangRewritingContext, " + "java.util.Collection)",
                 declaredFunctions, topExpr, metadataProvider, context, null);
-        PA.invokeMethod(rewriter, "inlineColumnAlias()");
+        PA.invokeMethod(rewriter, "resolveFunctionCalls()");
         PA.invokeMethod(rewriter, "generateColumnNames()");
         PA.invokeMethod(rewriter, "substituteGroupbyKeyExpression()");
         PA.invokeMethod(rewriter, "rewriteGroupBys()");
         PA.invokeMethod(rewriter, "rewriteSetOperations()");
+        PA.invokeMethod(rewriter, "inlineColumnAlias()");
+        PA.invokeMethod(rewriter, "rewriteWindowExpressions()");
+        PA.invokeMethod(rewriter, "rewriteGroupingSets()");
         PA.invokeMethod(rewriter, "variableCheckAndRewrite()");
+        PA.invokeMethod(rewriter, "extractAggregatesFromCaseExpressions()");
         PA.invokeMethod(rewriter, "rewriteGroupByAggregationSugar()");
-
+        PA.invokeMethod(rewriter, "rewriteWindowAggregationSugar()");
+        PA.invokeMethod(rewriter, "rewriteSpecialFunctionNames()");
     }
 
 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
index ea19f64..d3c5a2c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
@@ -107,7 +107,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
index 090b6f4..6a10149 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
@@ -121,7 +121,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
index 9cfb593..bdaa1c3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
@@ -29,10 +29,10 @@
       ]
       >=
       OperatorExpr [
-        FunctionCall emergencyTest.current-datetime@0[
+        FunctionCall asterix.current-datetime@0[
         ]
         -
-        FunctionCall emergencyTest.day-time-duration@1[
+        FunctionCall asterix.day-time-duration@1[
           LiteralExpr [STRING] [PT10H]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
index 9359bfa..c98fc93 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
@@ -20,10 +20,10 @@
 Let Variable [ Name=$time ]
   :=
   OperatorExpr [
-    FunctionCall emergencyTest.current-datetime@0[
+    FunctionCall asterix.current-datetime@0[
     ]
     -
-    FunctionCall emergencyTest.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT10H]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
index 95baeaa..6cd0030 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
@@ -24,6 +24,6 @@
       Field=timestamp
     ]
     >=
-    FunctionCall emergencyTest.current-datetime@0[
+    FunctionCall asterix.current-datetime@0[
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
index 6c2d45c..19bafd3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
@@ -24,6 +24,6 @@
       Field=timestamp
     ]
     >=
-    FunctionCall emergencyTest.current-datetime@0[
+    FunctionCall asterix.current-datetime@0[
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
index 165e2e3..ba2ff41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
@@ -32,7 +32,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -40,26 +40,26 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Let Variable [ Name=$jacca ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.8]
   ]
 Let Variable [ Name=$jaccb ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
   ]
 Let Variable [ Name=$jaccc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.3]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
index ec7c370..f7ec498 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
@@ -49,7 +49,7 @@
 ]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall twitter.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$t ]
       Field=text
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
index 7e68aa8..1d1899c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
@@ -63,7 +63,7 @@
   ]
 Let Variable [ Name=$unrankedTokensDBLP ]
   :=
-  FunctionCall fj-dblp-csx.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -114,7 +114,7 @@
   ]
 Let Variable [ Name=$unrankedTokensCSX ]
   :=
-  FunctionCall fj-dblp-csx.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
index 760a65f..7175ec1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
@@ -35,7 +35,7 @@
 ]
 Let Variable [ Name=$unrankedTokensDBLP ]
   :=
-  FunctionCall fuzzyjoin_078.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -59,7 +59,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin_078.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
index f63ae69..75e47cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
@@ -20,7 +20,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
index 4bfd511..ccd9f32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
@@ -20,7 +20,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
index b91eee9..473028d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
index f3ec986..6248728 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
@@ -21,7 +21,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
index 96828e4..fdf46f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
index adf6402..d8917a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index be82f72..6c7dd82 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -24,7 +24,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -33,7 +33,7 @@
       LiteralExpr [FALSE]
     ]
     ~=
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
index 65dfc45..d4eabb8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
@@ -22,8 +22,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
@@ -31,7 +31,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
index 9919418..fc39ba9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
@@ -22,8 +22,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
@@ -31,7 +31,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
index 81e0f92..1626785 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
index 6125ef7..b3de7ad 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
index 84b062d..b9e055b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
@@ -35,7 +35,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
index a452237..fb69611 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
@@ -35,7 +35,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
index 95538bb..6906987 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
index edd77ff..61f30e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
@@ -35,7 +35,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
index cfdd948..192b9a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
index 239a83fbb..3b734f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
@@ -35,7 +35,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
index 6ba9e63..964c8ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
@@ -20,7 +20,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
index 31c6b58..88f2e79 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -23,14 +23,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
index d0f765c..6b2ef84 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
@@ -21,14 +21,14 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
       LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
index 93cc528..13a5f3b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
@@ -21,14 +21,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index 4573700..50562cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
@@ -31,7 +31,7 @@
   ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index 80a0c1e..295bc07 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
@@ -31,7 +31,7 @@
   ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 1426c21..9908ea7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
index 6be8d11..360b8fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 23b6ef3..4bd24fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -38,8 +38,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
-      FunctionCall test.substring@3[
+    FunctionCall asterix.edit-distance-check@3[
+      FunctionCall asterix.substring@3[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index 4e740dd..3cc550e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -36,7 +36,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -46,7 +46,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
index bc735ac..10cc2e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -22,8 +22,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -31,7 +31,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index c56b4cc..2b7df8c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -33,7 +33,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -43,14 +43,14 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
index 73eea6c..1a98c4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
@@ -35,7 +35,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
index 8519356..1125acc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
@@ -35,7 +35,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
index 2069fba..f4a90e6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
@@ -35,7 +35,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
index ddda42c..b9cc80e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
@@ -35,7 +35,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
index 53299c1..9343f70 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
index 36c3ad3..6a2c11a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -32,7 +32,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -40,12 +40,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
index 149dadd..884b632 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
@@ -48,7 +48,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
index 6e07481..659a3c6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
@@ -54,7 +54,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
index ed58c20..880cf73 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -66,7 +66,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
index 9ba0a6c..21e6d40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
@@ -49,8 +49,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -58,7 +58,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
index c14577e..a8a3b7c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
@@ -55,8 +55,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -64,7 +64,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
index 48c7269..1a68dec 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
@@ -62,7 +62,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
index 309af23..fc91fc2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
index 177a4ab..13d4c9c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
@@ -62,7 +62,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
index 174ce27..acabdb3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
index fc3c6da..6c78a5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
@@ -62,7 +62,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
index a217c50..63fcf0a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
index 64fb45b..58e5337 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
@@ -56,14 +56,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
index dd4d340..db614be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
@@ -48,14 +48,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
index b05b6c4..bd8e3aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
@@ -54,14 +54,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
index feab647..e06271a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
@@ -50,7 +50,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.similarity-jaccard-check@3[
+        FunctionCall asterix.similarity-jaccard-check@3[
           FieldAccessor [
             Variable [ Name=$t ]
             Field=referred_topics
@@ -97,7 +97,7 @@
         Field=send_time
       ]
       >=
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-06-18T14:10:17]
       ]
     ]
@@ -108,7 +108,7 @@
         Field=send_time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-06-18T15:10:17]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index e0091da..2404dd0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -80,7 +80,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=message-text
@@ -133,7 +133,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
index 7953333..496e162 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
@@ -80,7 +80,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.similarity-jaccard-check@3[
+        FunctionCall asterix.similarity-jaccard-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=referred-topics
@@ -133,7 +133,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
index ec9d99f..2f0b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
@@ -43,7 +43,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
index fb901be..5e342d7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -48,7 +48,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
index 0ca48a7..5a3ee14 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -48,7 +48,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
index ba2ec52..9567f1b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -38,7 +38,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
index b7b4232..391303a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -45,7 +45,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
index 379fb25..b9277ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
@@ -48,7 +48,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-contains@3[
+      FunctionCall asterix.edit-distance-contains@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
index 31ae3d4..e9d5fe7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
@@ -48,7 +48,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
index a81df4e..690329c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
@@ -48,7 +48,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
index 331c38e..6d8ce54 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
@@ -38,7 +38,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
index 21aad57..f34e41f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
@@ -42,7 +42,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index e9579c5..a784bd9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -51,7 +51,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -60,7 +60,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index edbe33a..fa42c63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -51,7 +51,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -60,7 +60,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index 4b0b23e..0e9708d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -41,7 +41,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -50,7 +50,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
index 6335c6e..620a4ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
@@ -49,8 +49,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -58,7 +58,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
index 2b6296d..8e4844a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
@@ -49,8 +49,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -58,7 +58,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
index a217b81..41ca5dd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
@@ -39,8 +39,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -48,7 +48,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
index 14ce520..d201069 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
@@ -46,8 +46,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -55,7 +55,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
index 99dc8bd..363ed04 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
@@ -49,8 +49,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -58,7 +58,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
index ab4f3a7..038e003 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
@@ -49,8 +49,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -58,7 +58,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
index 21f2967..fe3316e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
@@ -39,8 +39,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -48,7 +48,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
index f72bb82..e70b58a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
@@ -43,8 +43,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -52,7 +52,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
index 51f5dbb..036b09f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
index 6cd3181..483fdde 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
index d4b9f2b..a3caf5d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
index 956b14b..4ce8f78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
@@ -59,7 +59,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
index 43f7ed9..5dfbcc8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
index 0d3ceda..828fdf0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
index bc94b88..757d663 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
index f1a1d3f..cb4f2ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
@@ -56,7 +56,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
index ce38b34..0eeff59 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
index 9b508c7..f968782 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
index 16beb06..39927e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
index cbf5765..21f585b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
@@ -59,7 +59,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
index 8822738..d03aaba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
index 49bd093..eb3b7e8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
index ecfac07..0b8979a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
index ca1098d..3b84c14 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
@@ -56,7 +56,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
index d63e18c..89a6e1c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
index 4fb802a..5273305 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
index 4d00756..f99a6c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
index edc49c9..e1d293d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
@@ -59,7 +59,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
index b72a4ef..726f1ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
index dcf7ba3..77e63a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
@@ -53,7 +53,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
index 0e76c21..d64050c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
@@ -52,7 +52,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
index fb53866..b7158b5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
@@ -56,7 +56,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index e7ce5f7..aeb5c2d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -50,14 +50,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index c37b4e6..51c8a69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -50,14 +50,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index aed4e5c..413fcf7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -40,14 +40,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 977fd78..0f36b7e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -65,14 +65,14 @@
 ]
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$t1 ]
         Field=message-text
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$t2 ]
         Field=message-text
@@ -93,7 +93,7 @@
         Field=tweetid
       ]
       <
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [20]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
index 8137523..3a30e84 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
@@ -48,14 +48,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
index 02f1194..d728851 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
@@ -48,14 +48,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
index 61f0161..fc7198f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
@@ -38,14 +38,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
index 425e82ce..49d2acb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
@@ -45,14 +45,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
index 3a12ec0..0252523 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
@@ -48,14 +48,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
index 090bf16..e67df1e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
@@ -48,14 +48,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
index ec3cea1..58000c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
@@ -38,14 +38,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
index 5f0e53a..ef04a85 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
@@ -42,14 +42,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
index 6687d69..7db8a94 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
@@ -136,7 +136,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
index 1fd15fa..fb366dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
@@ -156,7 +156,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
index 67a69d7..39e743a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
@@ -25,7 +25,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
index 239b045..8d823c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
@@ -25,7 +25,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
index fc47597..b31bc52 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -26,7 +26,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
index 05d2532..0727633 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
@@ -26,7 +26,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
index f00873b..c711fee13 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -26,7 +26,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
index fa976ab..f4fe1b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
@@ -26,7 +26,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 99df8bb..3373f5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -29,7 +29,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -41,7 +41,7 @@
       LiteralExpr [FALSE]
     ]
     ~=
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
index d4764a4..13f6890 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
@@ -27,8 +27,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -39,7 +39,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
index 993fc7c..c581611 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
@@ -27,8 +27,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -39,7 +39,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
index b60a90f..e7b386f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
@@ -41,7 +41,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
index a57d7bf..77a1e63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
@@ -41,7 +41,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
index 73895ec..ec18fdf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
@@ -41,7 +41,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
index 14402a0..5672136 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
@@ -41,7 +41,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
index 36a3968..8944f56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
@@ -40,7 +40,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
index 7662170..2b3fd59 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
@@ -41,7 +41,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
index c7de02f..951cc2c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
@@ -41,7 +41,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
index a1920b0..33be47b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
@@ -41,7 +41,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
index 07c2257..c319895 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
@@ -25,7 +25,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
index 115cffd..b03e6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -28,7 +28,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -38,7 +38,7 @@
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
index cd2f808..e8bf4a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
@@ -26,8 +26,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -36,7 +36,7 @@
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
       LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
index 8d6ebff..40574f5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
@@ -26,8 +26,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -36,7 +36,7 @@
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index cd87e3d..0818407 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -26,7 +26,7 @@
 ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -39,7 +39,7 @@
   ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index e83f266..fffd48a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -26,7 +26,7 @@
 ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -39,7 +39,7 @@
   ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 3182178..abd2b19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -26,7 +26,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
index 4d74189..9b45cff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -26,7 +26,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 12e5004..5fa1ef2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -49,8 +49,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
-      FunctionCall test.substring@3[
+    FunctionCall asterix.edit-distance-check@3[
+      FunctionCall asterix.substring@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index 83e7c39..2067c42 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -47,7 +47,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -60,7 +60,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
index da3e28d..36cd36e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -27,8 +27,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -39,7 +39,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index c313df1..88c222c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -38,7 +38,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -51,14 +51,14 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
index 7926519..f1740e6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
@@ -41,7 +41,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
index f811f6f..dfa394c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
@@ -41,7 +41,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
index d4fb901..02ad60e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
@@ -40,7 +40,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
index 7fbf43b..794d5cb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
@@ -41,7 +41,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
index 0e81882..f66ecd2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
@@ -26,8 +26,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -36,7 +36,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
index 09c2663..2881a88 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -37,7 +37,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -48,12 +48,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 21fc269..b502870 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -97,7 +97,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t1 ]
@@ -168,7 +168,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
index f27b10a..63c7261 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
@@ -97,7 +97,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.similarity-jaccard-check@3[
+        FunctionCall asterix.similarity-jaccard-check@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t1 ]
@@ -168,7 +168,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
index 2c56b6d..95723fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
index be76ff4..fb8882c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-contains@3[
+      FunctionCall asterix.edit-distance-contains@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
index 486ebf9..201b5ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
@@ -59,7 +59,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
index 3cbdf20..59d970e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index 766812b..22333cf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -61,7 +61,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -73,7 +73,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
index 4bf1d3a..cfe0ee8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
@@ -59,8 +59,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -71,7 +71,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
index 9eac854..6230626 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
@@ -60,8 +60,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -72,7 +72,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
index 6c3a6c7..a168d88 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
@@ -59,8 +59,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -71,7 +71,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
index 12d27fa..371a58b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
index 84e2153..9bdd0e8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
@@ -74,7 +74,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
index 79306cc..5b964fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
index 010d833..ab9edac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
index e4c4c65..e867a37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
@@ -74,7 +74,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
index 4df3370..8fa6c8a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
index d1d960a..19e40f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
index b52756f..3f13c3a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
@@ -74,7 +74,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
index 541c5c8..d3c444d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index a2df3ef..78d9cab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -60,7 +60,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -70,7 +70,7 @@
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 7371c6f..36d3927 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -76,8 +76,8 @@
 ]
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$t1 ]
@@ -86,7 +86,7 @@
         Field=message-text
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$t2 ]
@@ -113,7 +113,7 @@
         Field=tweetid
       ]
       <
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [20]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
index ca36bc2..3a22300 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -68,7 +68,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
index c2d5bdf..7518da7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
@@ -59,8 +59,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -69,7 +69,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
index d766ddf..8ab5b17 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -68,7 +68,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 5db718b..8bde23b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -90,7 +90,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -118,7 +118,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -138,7 +138,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 004d42a..c486ca1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -91,7 +91,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               FieldAccessor [
                 Variable [ Name=$t2 ]
@@ -141,7 +141,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -161,7 +161,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
index af4b22c..6e2f4e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
@@ -45,7 +45,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
index f0b71f8..88ede17 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
@@ -45,7 +45,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
index 4d62044..911ded3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
@@ -44,7 +44,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
index 42e98bd..35c6c68 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
@@ -135,7 +135,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
index eafaa62..ee998a5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
@@ -134,7 +134,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
index 3830ce2..5002b83 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
@@ -155,7 +155,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
index 763759e..e6a964f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
@@ -154,7 +154,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
index f6e781a..cab3477 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
@@ -24,7 +24,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
index 283e91c..dc27e08 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
@@ -24,7 +24,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
index e9a2f0a..95b82a5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -25,7 +25,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
index 8bc458d..6f79953 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
@@ -25,7 +25,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
index cea6433..1d0e98c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -25,7 +25,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
index 026476c..622bc67 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
@@ -25,7 +25,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 31ccaf8..4eac1f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -28,7 +28,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -40,7 +40,7 @@
       LiteralExpr [FALSE]
     ]
     ~=
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
index 3ff23f9..4d23eee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
@@ -26,8 +26,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -38,7 +38,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
index f57427b..6e8bcec 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
@@ -26,8 +26,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -38,7 +38,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
index 2088a9e..a05ab69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
@@ -24,7 +24,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
index 7efb273..b508d79 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -27,7 +27,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -37,7 +37,7 @@
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
index 4ee76d2..2cdb0a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
@@ -25,8 +25,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -35,7 +35,7 @@
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
       LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
index fe1460f..b4790d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
@@ -25,8 +25,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$o ]
@@ -35,7 +35,7 @@
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index a47c5d7..53aabf3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -25,7 +25,7 @@
 ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -38,7 +38,7 @@
   ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index b666419..963578c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -25,7 +25,7 @@
 ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -38,7 +38,7 @@
   ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 2f08590..6c21d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -25,7 +25,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
index b2a5d79..e7c5cdc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -25,7 +25,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 78aac04..49970e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -48,8 +48,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
-      FunctionCall test.substring@3[
+    FunctionCall asterix.edit-distance-check@3[
+      FunctionCall asterix.substring@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index 0559bbc..f58dc37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -46,7 +46,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -59,7 +59,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
index 336b9d6..5ff1c93 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -26,8 +26,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -38,7 +38,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index e246355..e09c194 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -37,7 +37,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -50,14 +50,14 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
index f710009..518ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
@@ -25,8 +25,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -35,7 +35,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
index fe3fb7c..0dddc3b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -36,7 +36,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -47,12 +47,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index ab37e11..ad10e1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -96,7 +96,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t1 ]
@@ -167,7 +167,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
index b80cae4..a91d675 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
@@ -51,7 +51,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
index 8b5571d..99f37fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
@@ -51,7 +51,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
index f8085ca..96cf45d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
@@ -42,7 +42,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
index 84389f3..19e5761 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
@@ -50,7 +50,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
index d2c4499..bf45f51 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
index 2d74c5f..f8d095b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
index 17bdeca..4e035d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -42,7 +42,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
index 9fcd085..aa2b585 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -56,7 +56,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
index 9fcd085..aa2b585 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
@@ -56,7 +56,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
index 399c1e7..481d88b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-contains@3[
+      FunctionCall asterix.edit-distance-contains@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
index b1ed987..b593eb1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
@@ -58,7 +58,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
index 402625f..658f36d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
index 4eed056..bad80a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
@@ -57,7 +57,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
index 6f51552..8d5c48f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
@@ -42,7 +42,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
index dc5e707..63a7e24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
@@ -56,7 +56,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
index dc5e707..63a7e24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
@@ -56,7 +56,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index 2705525..e78296e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -60,7 +60,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -72,7 +72,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index 1bba5a8..2c72b66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -60,7 +60,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -72,7 +72,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index 658259b..28f0316 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -45,7 +45,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -57,7 +57,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
index 274474e..7fa83e4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -71,7 +71,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
index 1a7702e..9c108d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -70,7 +70,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
index 27ac86c..bd600b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -70,7 +70,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
index 8cd5e54..f3e0583 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
@@ -43,8 +43,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -55,7 +55,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
index c5154c0..beb9f7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -69,7 +69,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
index e2a7a9f..b685fd2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
@@ -59,8 +59,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -71,7 +71,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
index fe046f5..6ea9758 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -70,7 +70,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
index 066f5ca..607ea6e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
@@ -58,8 +58,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -70,7 +70,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
index 4bbc6ca..da33640 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
@@ -43,8 +43,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -55,7 +55,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
index b8a8e6b..d8fb211 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -69,7 +69,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index f2872bb..957db1c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -69,7 +69,7 @@
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index 9e3ccd0..7325128 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -59,7 +59,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -69,7 +69,7 @@
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index d8d300d..8ae897f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -44,7 +44,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -54,7 +54,7 @@
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
index 32449a8..fb2de63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
@@ -58,7 +58,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
@@ -68,7 +68,7 @@
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
index bbd9e0b..9240411 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -75,8 +75,8 @@
 ]
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$t1 ]
@@ -85,7 +85,7 @@
         Field=message-text
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$t2 ]
@@ -112,7 +112,7 @@
         Field=tweetid
       ]
       <
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [20]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
index 6ed0796..81152b2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -67,7 +67,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
index 6666280..ab13a8d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -67,7 +67,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
index 84ddb2c..a11fccb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
@@ -42,8 +42,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -52,7 +52,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
index fe15603..6b51ee3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
@@ -56,8 +56,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -66,7 +66,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
index 55e4dff..31e1ed3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
@@ -58,8 +58,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -68,7 +68,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
index d94b65b..5f693a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -67,7 +67,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
index e30d595..dce9644 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
@@ -57,8 +57,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -67,7 +67,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
index b313d66..9b2b54a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
@@ -42,8 +42,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -52,7 +52,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
index 544fcc6..5b113fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
@@ -56,8 +56,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -66,7 +66,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 9277b59..0b31824 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -89,7 +89,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -117,7 +117,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -137,7 +137,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 7da0f59..76669c4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -90,7 +90,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               FieldAccessor [
                 Variable [ Name=$t2 ]
@@ -140,7 +140,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -160,7 +160,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
index af4b22c..6e2f4e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
@@ -45,7 +45,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
index f0b71f8..88ede17 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
@@ -45,7 +45,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
index 4d62044..911ded3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
@@ -44,7 +44,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
index bfe83a2..023d81c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
@@ -44,7 +44,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
index bfe83a2..023d81c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
@@ -44,7 +44,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
index b48f1e5..57290ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
@@ -106,7 +106,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
index 9e6d696..353e552 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
@@ -105,7 +105,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
index a08f422..9de1874 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
@@ -120,7 +120,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
index 8b54d5d..77e3668 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
@@ -119,7 +119,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
index d0331ae..bd5a2e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
@@ -19,7 +19,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
index ec5826f..1d589dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
@@ -19,7 +19,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
index 82ea6c3..e480eab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -20,7 +20,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
index 99dd1cc..bd20143 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
@@ -20,7 +20,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
index 08b1cba..b7f394f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -20,7 +20,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
index bc0f6c3..eb7b1ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
@@ -20,7 +20,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 12dcd8d..89001af 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -23,7 +23,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -32,7 +32,7 @@
       LiteralExpr [FALSE]
     ]
     ~=
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
index 3495dbd..4211435 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
@@ -21,8 +21,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
@@ -30,7 +30,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
index d8f71d0..9526803 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
@@ -21,8 +21,8 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
@@ -30,7 +30,7 @@
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
       ]
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
         LiteralExpr [LONG] [3]
         LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
index 6480fe5..fe7b0e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
@@ -19,7 +19,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
index e175bee..78a31e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -22,14 +22,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
index 87d5779..31c0415 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
@@ -20,14 +20,14 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.similarity-jaccard-check@3[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard-check@3[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
       LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
index 74d7bd4..7985db6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
@@ -20,14 +20,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index bfeb54e..51054c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -20,7 +20,7 @@
 ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
@@ -30,7 +30,7 @@
   ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index 917fdb0..d063d5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -20,7 +20,7 @@
 ]
 Let Variable [ Name=$edb ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
@@ -30,7 +30,7 @@
   ]
 Let Variable [ Name=$eda ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index b5e2691..69f204a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -20,7 +20,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
index 111bb1c..77f53c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -20,7 +20,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 10f09c4..77154d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -37,8 +37,8 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
-      FunctionCall test.substring@3[
+    FunctionCall asterix.edit-distance-check@3[
+      FunctionCall asterix.substring@3[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index f3f3545..2275853 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -35,7 +35,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -45,7 +45,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
index 9e5c32e..bc4fb5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -21,8 +21,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -30,7 +30,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index 8bae958..aa93ac3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -32,7 +32,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -42,14 +42,14 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
index 586ae2a..49d9157 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
@@ -20,14 +20,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
index 7bc1846..6f506bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -39,12 +39,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 331bdf1..446d219 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -79,7 +79,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=message-text
@@ -132,7 +132,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
index b80cae4..a91d675 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
@@ -51,7 +51,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
index b9af450..4bb674f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
@@ -51,7 +51,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
index f8085ca..96cf45d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
@@ -42,7 +42,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
index 84389f3..19e5761 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
@@ -50,7 +50,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$o1 ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
index d579f69..052ccba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -47,7 +47,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
index b612948..b16b062 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -47,7 +47,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
index b2ed201..64c187e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -37,7 +37,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
index 32df103..a8b47c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -46,7 +46,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
index 32df103..a8b47c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
@@ -46,7 +46,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-check@3[
+      FunctionCall asterix.edit-distance-check@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
index fbdd268..c76b1d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
@@ -44,7 +44,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
index 7211a5c..e74dded 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
@@ -47,7 +47,7 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.edit-distance-contains@3[
+      FunctionCall asterix.edit-distance-contains@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
index d686ced..7a73244 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
@@ -47,7 +47,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
index cc9c208..27a5d9d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
@@ -47,7 +47,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
index d619a95..a888ea2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
@@ -37,7 +37,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
index d9c54c1..25eb7e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
@@ -46,7 +46,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
index d9c54c1..25eb7e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
@@ -46,7 +46,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
index db0924d..43bf4ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
@@ -41,7 +41,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index 97c1778..825df9a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -50,7 +50,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -59,7 +59,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index 879eea4..161a7c9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -50,7 +50,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -59,7 +59,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index 39138f4..dab9992 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -40,7 +40,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -49,7 +49,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
index 9b892c5..af199f5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
@@ -49,7 +49,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
@@ -58,7 +58,7 @@
         LiteralExpr [FALSE]
       ]
       ~=
-      FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.gram-tokens@3[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
index e38106b..f878e0d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
@@ -48,8 +48,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -57,7 +57,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
index c70c30f..0473451 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
@@ -48,8 +48,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -57,7 +57,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
index d15b32d..7749d91 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
@@ -38,8 +38,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -47,7 +47,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
index 7e45c77..16ebed1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
@@ -47,8 +47,8 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -56,7 +56,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
index 073e7f5..dfe5998 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
@@ -45,8 +45,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -54,7 +54,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
index d661706..bc6f3e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
@@ -48,8 +48,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -57,7 +57,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
index 16dcb06..87f9c21 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
@@ -48,8 +48,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -57,7 +57,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
index 37fd896..082647c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
@@ -38,8 +38,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -47,7 +47,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
index 511eb3e..1e56d15 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
@@ -47,8 +47,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -56,7 +56,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
index fe548d6..e07e7a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
@@ -42,8 +42,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -51,7 +51,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index b30d7ee..c40a066 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -49,14 +49,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index e1da73f..d15ca81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -49,14 +49,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index 807f5bf..ca7e2f6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -39,14 +39,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
index 0d41007..1ffc872 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
@@ -48,14 +48,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
index def707e..d34a751 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -64,14 +64,14 @@
 ]
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$t1 ]
         Field=message-text
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$t2 ]
         Field=message-text
@@ -92,7 +92,7 @@
         Field=tweetid
       ]
       <
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [20]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
index 61f40dc..ed3a5a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
@@ -47,14 +47,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
index bcc540a..9da89f0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
@@ -47,14 +47,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
index 7883806..523861b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
@@ -37,14 +37,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
index c0d2879..df66e19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
@@ -46,14 +46,14 @@
 Where
   OperatorExpr [
     IndexAccessor [
-      FunctionCall test.similarity-jaccard-check@3[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-check@3[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
index 3f14745..53707b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
@@ -44,14 +44,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
index fe9bcfe..065f46b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
@@ -47,14 +47,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
index e856da5..58a3af9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
@@ -47,14 +47,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
index 1c780a1..34684ca 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
@@ -37,14 +37,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
index e070d7a..6c56a32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
@@ -46,14 +46,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
index a311ef2..d53274d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
@@ -41,14 +41,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 8fe06f1..db36dd9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -72,7 +72,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -97,7 +97,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -111,7 +111,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 0a533b8..0443877 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -73,7 +73,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               Variable [ Name=$t2 ]
               Field=sender-location
@@ -111,7 +111,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -125,7 +125,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
index 4605152..d6c6deb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
@@ -51,7 +51,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
index dfd9368..1c6eb1b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
@@ -51,7 +51,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
index d2d61ef..e7ebb5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
@@ -38,7 +38,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
index 2a53cb0..fdf1e55 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
@@ -39,7 +39,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
index 2a53cb0..fdf1e55 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
@@ -39,7 +39,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
index 52b59f4..7f05cfe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
@@ -382,7 +382,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall q09_group_by.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$p ]
         Field=p_name
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
index d1ebcac..7ff3b22 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
@@ -16,7 +16,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:00:00]
         ]
       )
@@ -40,7 +40,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:01:00]
         ]
       )
@@ -64,7 +64,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:02:00]
         ]
       )
@@ -88,7 +88,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:03:00]
         ]
       )
@@ -112,7 +112,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:04:00]
         ]
       )
@@ -136,7 +136,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:05:00]
         ]
       )
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
index 62f92a7..3243269 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
@@ -151,7 +151,7 @@
       ]
       Let Variable [ Name=$phone_substr ]
         :=
-        FunctionCall tpch.substring@3[
+        FunctionCall asterix.substring@3[
           FieldAccessor [
             Variable [ Name=$c ]
             Field=c_phone
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
index 64b1b09..6f17b8f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
@@ -49,7 +49,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender_location
@@ -67,7 +67,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender_location
@@ -82,7 +82,7 @@
         Field=send_time
       ]
       >=
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-06-18T14:10:17]
       ]
     ]
@@ -93,7 +93,7 @@
         Field=send_time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-06-18T15:10:17]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index ef9d197..0e3e5a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -73,7 +73,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -98,7 +98,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -112,7 +112,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index d07da6c..c586622 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -74,7 +74,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               Variable [ Name=$t2 ]
               Field=sender-location
@@ -112,7 +112,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -126,7 +126,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
index 70939a9..dfd39ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
@@ -34,7 +34,7 @@
   (
     LiteralExpr [STRING] [execution-time]
     :
-    FunctionCall twitter.current-datetime@0[
+    FunctionCall asterix.current-datetime@0[
     ]
   )
   (
@@ -60,7 +60,7 @@
     ]
     Let Variable [ Name=$circle ]
       :=
-      FunctionCall twitter.create-circle@2[
+      FunctionCall asterix.create-circle@2[
         FieldAccessor [
           Variable [ Name=$tweet ]
           Field=location
@@ -68,7 +68,7 @@
         LiteralExpr [DOUBLE] [30.0]
       ]
     Where
-      FunctionCall twitter.spatial-intersect@2[
+      FunctionCall asterix.spatial-intersect@2[
         FieldAccessor [
           Variable [ Name=$tweet ]
           Field=sender-location
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
index b1ef06d..2391565 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
@@ -40,7 +40,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
index 5b894a8..b29fe1f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
@@ -40,7 +40,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
index 88f292c..f04a100 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
@@ -39,7 +39,7 @@
   AS Variable [ Name=$b ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
index 23f1b56..b5d3bf1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
@@ -33,12 +33,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
index 43691ee..4125b9a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
@@ -33,12 +33,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
index 471d006..fe90f5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
index c78b8cb..877bcbd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
index 9bb5957..2fe2205 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
index 73fd3d8..4d81225 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
index 693d2942..9524164 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
index 1ce8ea8..65642c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
index efe51d3..ee2107d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
index 6ad672e..38e22b1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
@@ -21,7 +21,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
index 97c36bd..1992919 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
index 510fbfc..fe12d67 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
@@ -23,7 +23,7 @@
   OperatorExpr [
     LiteralExpr [LONG] [2]
     >=
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
index 861376f..58c443c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
index 8b565e3..6edbf57 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
@@ -23,7 +23,7 @@
   OperatorExpr [
     LiteralExpr [LONG] [3]
     >
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
index 993573d..68b6427 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
index 79c3f78..42feccb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
@@ -23,7 +23,7 @@
   OperatorExpr [
     LiteralExpr [LONG] [2]
     <=
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
index 4c25e1c..c864e3c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
@@ -21,7 +21,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
index e3da8fa..97ab3e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
@@ -23,7 +23,7 @@
   OperatorExpr [
     LiteralExpr [LONG] [2]
     <
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
index fe5b837..c000fe6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
@@ -23,14 +23,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
index 4a60b67..73d96c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
index f7dc16c..e4e045b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
index bb0b900..b2d48ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
index c0f61b1..9be8f7e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
index 4beebd6..94af050 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
index a34fd1e..f29c220 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
index 0911e49..b221064 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
index 31f5160..d877c2c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
index 0628802..edf7b0a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
@@ -21,14 +21,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
index a4d18f5..8b23c9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
@@ -23,14 +23,14 @@
   OperatorExpr [
     LiteralExpr [FLOAT] [0.8]
     <=
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
index 38634ed..456ddc3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
@@ -21,14 +21,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
index 5f83e9b..e36a6e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
@@ -23,14 +23,14 @@
   OperatorExpr [
     LiteralExpr [FLOAT] [0.8]
     <
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
index aba64ae..8dbd31c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
@@ -21,14 +21,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
index 3f6a9a3..a2f20e4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
@@ -23,14 +23,14 @@
   OperatorExpr [
     LiteralExpr [FLOAT] [0.8]
     >=
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
index 17815d3..3a17439 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
@@ -21,14 +21,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
index fee5f3a..e19f053 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
@@ -23,14 +23,14 @@
   OperatorExpr [
     LiteralExpr [FLOAT] [0.8]
     >
-    FunctionCall test.similarity-jaccard@2[
-      FunctionCall test.word-tokens@1[
+    FunctionCall asterix.similarity-jaccard@2[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paper ]
           Field=title
         ]
       ]
-      FunctionCall test.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         LiteralExpr [STRING] [Transactions for Cooperative Environments]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
index 4bfd511..ccd9f32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
@@ -20,7 +20,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
index 43691ee..4125b9a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
@@ -33,12 +33,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
index eaff5d1..6ae94e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
@@ -21,14 +21,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
index a1c3dc4..19fa3e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
@@ -77,12 +77,12 @@
       ]
       AS Variable [ Name=$paperLeft ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensLeft]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenLeft]
           ]
@@ -96,12 +96,12 @@
       ]
       AS Variable [ Name=$paperRight ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensRight]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenRight]
           ]
@@ -112,8 +112,8 @@
     ]
     Let Variable [ Name=$lenLeft ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperLeft ]
             Field=title
@@ -126,7 +126,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperLeft ]
               Field=title
@@ -143,7 +143,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -181,7 +181,7 @@
 
           )
           AS Variable [ Name=$tokenRanked ]
- AT 
+ AT
 Variable [ Name=$i ]
         ]
         Where
@@ -197,8 +197,8 @@
       )
     Let Variable [ Name=$lenRight ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperRight ]
             Field=title
@@ -211,7 +211,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperRight ]
               Field=title
@@ -228,7 +228,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -266,7 +266,7 @@
 
           )
           AS Variable [ Name=$tokenRanked ]
- AT 
+ AT
 Variable [ Name=$i ]
         ]
         Where
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenLeft ]
         Variable [ Name=$tokensLeft ]
         Variable [ Name=$lenRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
index 20c07d1..b9fd2a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
@@ -45,7 +45,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql
index 1dd358f..4562406 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries-sql-like/6.aql
@@ -19,7 +19,7 @@
 from $user in dataset('Users')
 with $similar_users :=
    from $similar_user in dataset('Users')
-   with $similarity := jaccard_similarity($user.interests, $similar_user.interests)
+   with $similarity := similarity_jaccard($user.interests, $similar_user.interests)
    where $user != $similar_user
    and $similarity >= .75
    order by $similarity desc
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql
index f8b06df..62fe967 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries/6.aql
@@ -19,7 +19,7 @@
 for $user in dataset('Users')
 let $similar_users :=
    for $similar_user in dataset('Users')
-   let $similarity := jaccard_similarity($user.interests, $similar_user.interests)
+   let $similarity := similarity_jaccard($user.interests, $similar_user.interests)
    where $user != $similar_user
    and $similarity >= .75
    order by $similarity desc
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/6.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/6.sqlpp
index 5eae7fd..f02a231 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/6.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/6.sqlpp
@@ -22,7 +22,7 @@
 with  similar_users as (
       select element {'user_name':similar_user.name,'similarity':similarity}
       from  Users as similar_user
-      with  similarity as jaccard_similarity(user.interests,similar_user.interests)
+      with  similarity as similarity_jaccard(user.interests,similar_user.interests)
       where ((user != similar_user) and (similarity >= 0.75))
       order by similarity desc
       limit 10
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/union.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/union.sqlpp
index 56464ba..0615494 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/union.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/union.sqlpp
@@ -17,6 +17,17 @@
  * under the License.
  */
 
+declare function foo1() {
+  []
+};
+
+declare function foo2() {
+  []
+};
+
+declare function foo3() {
+  []
+};
 
 select element l
 from  foo1() as l
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
index b784f99..89a72eb 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
@@ -48,7 +48,7 @@
     ]
     Let Variable [ Name=$similarity ]
       :=
-      FunctionCall null.jaccard_similarity@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$user ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
index 7d76691..37f2369 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT [
-Variable [ Name=#1 ]
+Variable [ Name=#2 ]
 root
 ]
 FROM [  FunctionCall asterix.dataset@1[
@@ -15,12 +15,12 @@
     Variable [ Name=$t ]
     Field=id
   ]
-  GROUP AS Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#1 ]
   (
     t:=Variable [ Name=$t ]
   )
 
-Let Variable [ Name=#1 ]
+Let Variable [ Name=#2 ]
   :=
   FunctionCall asterix.sql-sum@1[
     (
@@ -43,12 +43,12 @@
         ]
       ]
       ]
-      FROM [        Variable [ Name=#2 ]
+      FROM [        Variable [ Name=#1 ]
         AS Variable [ Name=#3 ]
       ]
     )
   ]
 Orderby
-  Variable [ Name=#1 ]
+  Variable [ Name=#2 ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
index f72802f..f485782 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [root]
     :
-    Variable [ Name=#1 ]
+    Variable [ Name=#2 ]
   )
 ]
 ]
@@ -20,12 +20,12 @@
     Variable [ Name=$t ]
     Field=id
   ]
-  GROUP AS Variable [ Name=#2 ]
+  GROUP AS Variable [ Name=#1 ]
   (
     t:=Variable [ Name=$t ]
   )
 
-Let Variable [ Name=#1 ]
+Let Variable [ Name=#2 ]
   :=
   FunctionCall asterix.sql-sum@1[
     (
@@ -48,12 +48,12 @@
         ]
       ]
       ]
-      FROM [        Variable [ Name=#2 ]
+      FROM [        Variable [ Name=#1 ]
         AS Variable [ Name=#3 ]
       ]
     )
   ]
 Orderby
-  Variable [ Name=#1 ]
+  Variable [ Name=#2 ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
index 5098fbd..3390da5 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_correlate.ast
@@ -27,7 +27,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_022.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,0.0]
         ]
       )
@@ -41,7 +41,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_022.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,1.0]
         ]
       )
@@ -55,7 +55,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_022.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,1.0]
         ]
       )
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
index cb25a66..1ef4dcb 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_left_outer_join.ast
@@ -27,7 +27,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_021.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,0.0]
         ]
       )
@@ -41,7 +41,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_021.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,1.0]
         ]
       )
@@ -55,7 +55,7 @@
       (
         LiteralExpr [STRING] [location]
         :
-        FunctionCall test_021.point@1[
+        FunctionCall asterix.point@1[
           LiteralExpr [STRING] [0.0,1.0]
         ]
       )
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
index 60fc518..cc66f0a 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
@@ -101,7 +101,7 @@
 Query:
 Let Variable [ Name=$result ]
   :=
-  FunctionCall null.calculate@1[
+  FunctionCall Default.calculate@1[
     (
       SELECT ELEMENT [
       Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl3.ast
index 54032ff..e7c8632 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl3.ast
@@ -3,7 +3,7 @@
 }
 
 Query:
-FunctionCall null.function with spaces@2[
+FunctionCall Default.function with spaces@2[
   LiteralExpr [LONG] [1]
   LiteralExpr [LONG] [2]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
index 0b0ec68..ef53092 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/union.ast
@@ -1,8 +1,23 @@
+FunctionDecl foo1([]) {
+  OrderedListConstructor [
+  ]
+}
+
+FunctionDecl foo2([]) {
+  OrderedListConstructor [
+  ]
+}
+
+FunctionDecl foo3([]) {
+  OrderedListConstructor [
+  ]
+}
+
 Query:
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall null.foo1@0[
+FROM [  FunctionCall Default.foo1@0[
   ]
   AS Variable [ Name=$l ]
 ]
@@ -10,7 +25,7 @@
   SELECT ELEMENT [
   Variable [ Name=$l ]
   ]
-  FROM [    FunctionCall null.foo2@0[
+  FROM [    FunctionCall Default.foo2@0[
     ]
     AS Variable [ Name=$l ]
   ]
@@ -18,7 +33,7 @@
   SELECT ELEMENT [
   Variable [ Name=$l ]
   ]
-  FROM [    FunctionCall null.foo3@0[
+  FROM [    FunctionCall Default.foo3@0[
     ]
     AS Variable [ Name=$l ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
index 8a1b335..a52f1d5 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/utf-8.ast
@@ -1,8 +1,8 @@
 Query:
-FunctionCall null.string-to-codepoint@1[
+FunctionCall asterix.string-to-codepoint@1[
   LiteralExpr [STRING] [äöß]
 ]
 Query:
-FunctionCall null.string-to-codepoint@1[
+FunctionCall asterix.string-to-codepoint@1[
   LiteralExpr [STRING] [迎]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp
deleted file mode 100644
index fa9ccad..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-DROP DATAVERSE gby IF EXISTS;
-CREATE DATAVERSE gby;
-
-USE gby;
-
-CREATE TYPE EmployeeType AS {
-  id : string
-};
-
-CREATE TYPE IncentiveType AS {
-  job_category: string
-};
-
-CREATE TYPE SuperStarType AS {
-  id : string
-};
-
-CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
-CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
-CREATE DATASET SuperStars(SuperStarType) PRIMARY KEY id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp
deleted file mode 100644
index fa9ccad..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-DROP DATAVERSE gby IF EXISTS;
-CREATE DATAVERSE gby;
-
-USE gby;
-
-CREATE TYPE EmployeeType AS {
-  id : string
-};
-
-CREATE TYPE IncentiveType AS {
-  job_category: string
-};
-
-CREATE TYPE SuperStarType AS {
-  id : string
-};
-
-CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
-CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
-CREATE DATASET SuperStars(SuperStarType) PRIMARY KEY id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp
deleted file mode 100644
index cfa1f24..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-USE gby;
-
-INSERT INTO Employee (
-   {
-    'id': '123',
-    'job_category': 'Cook',
-    'salary': 2000,
-    'department_id': 'K55'
-   }
-);
-
-INSERT INTO Incentive (
-  { 'job_category': 'Cook',
-    'bonus': 1000
-  }
-);
-
-INSERT INTO SuperStars (
-  {
-    'id': '123'
-  }
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.4.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.4.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.5.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.5.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.6.query.sqlpp
similarity index 69%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.6.query.sqlpp
index cfa1f24..47e750d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.6.query.sqlpp
@@ -17,27 +17,16 @@
  * under the License.
  */
 
-
 USE gby;
 
-INSERT INTO Employee (
-   {
-    'id': '123',
-    'job_category': 'Cook',
-    'salary': 2000,
-    'department_id': 'K55'
-   }
-);
+/*
+ * Test that builtin function names are compared case-insensitive
+ * when replacing SELECT expression with GROUP BY expression
+ */
 
-INSERT INTO Incentive (
-  { 'job_category': 'Cook',
-    'bonus': 1000
-  }
-);
-
-INSERT INTO SuperStars (
-  {
-    'id': '123'
-  }
-);
+FROM Employee e
+    JOIN Incentive i ON e.job_category = i.job_category
+    JOIN SuperStars s ON e.id = s.id
+GROUP BY substr(e.department_id, 0)
+SELECT SUBSTR(e.department_id, 0) as deptId, SUM(e.salary + i.bonus) AS star_cost;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/win_negative/win_negative.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/win_negative/win_negative.4.query.sqlpp
index 59a0127..3b154ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/win_negative/win_negative.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/win_negative/win_negative.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description  : Test error message for an unknown window function
+ * Description  : Test error message for a non-window function
  *              : with identifier resolution
  * Expected Res : FAILURE
  */
@@ -25,4 +25,4 @@
 from (
   from range(1, 2) x, range(1, 2) y select x, y
 ) t
-select unknown_func(x) over (partition by y)
+select lower(x) over (partition by y)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr-2/gby-expr-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr-2/gby-expr-2.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr-3/gby-expr-3.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr-3/gby-expr-3.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.6.adm
new file mode 100644
index 0000000..3424a57
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/gby-expr/gby-expr.6.adm
@@ -0,0 +1 @@
+{ "deptId": "K55", "star_cost": 3000 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
index 64386d6..e256cca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number/agg_number.3.ast
@@ -5,10 +5,10 @@
     :
     FunctionCall asterix.sql-count@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -21,10 +21,10 @@
     :
     FunctionCall asterix.sql-avg@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -37,10 +37,10 @@
     :
     FunctionCall asterix.sql-sum@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -53,10 +53,10 @@
     :
     FunctionCall asterix.sql-min@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -69,10 +69,10 @@
     :
     FunctionCall asterix.sql-max@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -85,10 +85,10 @@
     :
     FunctionCall asterix.sql-stddev_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -101,10 +101,10 @@
     :
     FunctionCall asterix.sql-stddev_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -117,10 +117,10 @@
     :
     FunctionCall asterix.sql-var_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -133,10 +133,10 @@
     :
     FunctionCall asterix.sql-var_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -149,10 +149,10 @@
     :
     FunctionCall asterix.sql-skewness@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -165,10 +165,10 @@
     :
     FunctionCall asterix.sql-kurtosis@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -181,10 +181,10 @@
     :
     FunctionCall asterix.sql-count@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -197,10 +197,10 @@
     :
     FunctionCall asterix.sql-avg@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -213,10 +213,10 @@
     :
     FunctionCall asterix.sql-sum@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -229,10 +229,10 @@
     :
     FunctionCall asterix.sql-min@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -245,10 +245,10 @@
     :
     FunctionCall asterix.sql-max@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -261,10 +261,10 @@
     :
     FunctionCall asterix.sql-stddev_samp@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -277,10 +277,10 @@
     :
     FunctionCall asterix.sql-stddev_pop@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -293,10 +293,10 @@
     :
     FunctionCall asterix.sql-var_samp@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -309,10 +309,10 @@
     :
     FunctionCall asterix.sql-var_pop@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -325,10 +325,10 @@
     :
     FunctionCall asterix.sql-skewness@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -341,10 +341,10 @@
     :
     FunctionCall asterix.sql-kurtosis@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.4.ast
index 6ed2da5..225a169 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double/avg_double.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.4.ast
index b7ab21d..4f65985 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
index c2f543d..f03e0ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -30,6 +30,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.4.ast
index 3351633..e0f92fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float/avg_float.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_null.4.ast
index f8904be..8e5e508 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.4.ast
index 09b14c2..977ece3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16/avg_int16.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.4.ast
index 39ec752..c583e53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.4.ast
index 08e7eef..b488440 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32/avg_int32.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.4.ast
index 1143883..93783dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.4.ast
index f156a1b..95c1de1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64/avg_int64.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.4.ast
index 35979d4..ec53307 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.4.ast
index 29133cb..3d5fe2b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8/avg_int8.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.array_avg@1[
+WINDOW asterix.sql-avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.4.ast
index 14ceeb5..51422fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.array_avg@1[
+      WINDOW asterix.sql-avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
index 7fac994..2c42fc1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [10]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
index 27e0619..30fc192 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_mixed/min_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
index 46f9fd5..a866be7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
index a06070c..906ae0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sql-avg@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
index f1abf16..559f7cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count/scalar_count.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
index 12d3e6f..ca7769c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sql-count@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
index c75afa6..9815748 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max/scalar_max.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -103,13 +103,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
index eb42b80..dcde0e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -110,13 +110,13 @@
   :=
   FunctionCall asterix.sql-max@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
index 2827888..c7c7c18 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min/scalar_min.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -103,13 +103,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
index 6237a07..eec5aaa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -110,13 +110,13 @@
   :=
   FunctionCall asterix.sql-min@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
index 812e172..bac6515 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
index 94722a4..cecce51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sql-sum@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
index c21fa1c..d2c2e8a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float/sum_float.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
index 62fc04f..3fd8df5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16/sum_int16.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
index 402f257..9b6a747 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32/sum_int32.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
index 1e4a755..77f5a7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64/sum_int64.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
index cd32941..3058d30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8/sum_int8.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
index eb44b3a..70ab82b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.05.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.05.ast
index 28919af..5c4635c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.05.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.05.ast
@@ -1,83 +1,163 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-FunctionCall asterix.sql-count@1[
-  (
-    SELECT ELEMENT [
-    LiteralExpr [LONG] [1]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-    Where
-      OperatorExpr [
-        FieldAccessor [
-          FieldAccessor [
-            Variable [ Name=#2 ]
-            Field=tenk
-          ]
-          Field=four
-        ]
-        >
-        LiteralExpr [LONG] [0]
-      ]
-  )
+SELECT ELEMENT [
+Variable [ Name=#2 ]
 ]
-cnt
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
-      ]
-      Field=four
-    ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-    Where
-      OperatorExpr [
-        FieldAccessor [
-          FieldAccessor [
-            Variable [ Name=#3 ]
-            Field=tenk
-          ]
-          Field=four
-        ]
-        >
-        LiteralExpr [LONG] [0]
-      ]
-  )
-]
-sm
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
+FROM [  (
+    SELECT [
     Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
+    two
+    FunctionCall asterix.sql-count@1[
+      (
+        SELECT ELEMENT [
+        LiteralExpr [LONG] [1]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#3 ]
+        ]
+        Where
+          OperatorExpr [
+            FieldAccessor [
+              FieldAccessor [
+                Variable [ Name=#3 ]
+                Field=tenk
+              ]
+              Field=four
+            ]
+            >
+            LiteralExpr [LONG] [0]
+          ]
+      )
     ]
-  )
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    cnt
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=four
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+        Where
+          OperatorExpr [
+            FieldAccessor [
+              FieldAccessor [
+                Variable [ Name=#4 ]
+                Field=tenk
+              ]
+              Field=four
+            ]
+            >
+            LiteralExpr [LONG] [0]
+          ]
+      )
+    ]
+    sm
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
+      ]
+      AS Variable [ Name=$tenk ]
+    ]
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      FunctionCall asterix.sql-count@1[
+        (
+          SELECT ELEMENT [
+          LiteralExpr [LONG] [1]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+          Where
+            OperatorExpr [
+              FieldAccessor [
+                FieldAccessor [
+                  Variable [ Name=#5 ]
+                  Field=tenk
+                ]
+                Field=four
+              ]
+              >
+              LiteralExpr [LONG] [0]
+            ]
+        )
+      ]
+      cnt
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=four
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+          Where
+            OperatorExpr [
+              FieldAccessor [
+                FieldAccessor [
+                  Variable [ Name=#6 ]
+                  Field=tenk
+                ]
+                Field=four
+              ]
+              >
+              LiteralExpr [LONG] [0]
+            ]
+        )
+      ]
+      sm
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+  )
+  AS Variable [ Name=#2 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#2 ]
+    Field=two
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.06.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.06.ast
index 60815f4..d01f24b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.06.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.06.ast
@@ -16,9 +16,28 @@
   Field=tenthous
 ]
 tenthous
-WINDOW test.count@1[
-  Variable [ Name=$tenthous ]
+WINDOW asterix.sql-count@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#7 ]
+        Field=tenk
+      ]
+      Field=tenthous
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#7 ]
+    ]
+  )
 ]
+  AS Variable [ Name=#1 ]
+  (
+    tenk:=Variable [ Name=$tenk ]
+    #4:=Variable [ Name=#4 ]
+    #6:=Variable [ Name=#6 ]
+  )
 OVER (
   ORDER BY
     FieldAccessor [
@@ -28,9 +47,28 @@
     ASC
 )
 cnt
-WINDOW test.sum@1[
-  Variable [ Name=$tenthous ]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#8 ]
+        Field=tenk
+      ]
+      Field=tenthous
+    ]
+    ]
+    FROM [      Variable [ Name=#2 ]
+      AS Variable [ Name=#8 ]
+    ]
+  )
 ]
+  AS Variable [ Name=#2 ]
+  (
+    tenk:=Variable [ Name=$tenk ]
+    #4:=Variable [ Name=#4 ]
+    #6:=Variable [ Name=#6 ]
+  )
 OVER (
   ORDER BY
     FieldAccessor [
@@ -40,15 +78,32 @@
     ASC
 )
 sm
-WINDOW test.count@1[
-  Variable [ Name=$tenthous ]
-]
-  FILTER (WHERE
-    OperatorExpr [
-      Variable [ Name=$twothous ]
-      =
-      LiteralExpr [LONG] [0]
+WINDOW asterix.sql-count@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#9 ]
+        Field=tenk
+      ]
+      Field=tenthous
     ]
+    ]
+    FROM [      Variable [ Name=#3 ]
+      AS Variable [ Name=#9 ]
+    ]
+    Where
+      FieldAccessor [
+        Variable [ Name=#9 ]
+        Field=#4
+      ]
+  )
+]
+  AS Variable [ Name=#3 ]
+  (
+    tenk:=Variable [ Name=$tenk ]
+    #4:=Variable [ Name=#4 ]
+    #6:=Variable [ Name=#6 ]
   )
 OVER (
   ORDER BY
@@ -59,15 +114,32 @@
     ASC
 )
 cnt_filter
-WINDOW test.sum@1[
-  Variable [ Name=$tenthous ]
-]
-  FILTER (WHERE
-    OperatorExpr [
-      Variable [ Name=$twothous ]
-      =
-      LiteralExpr [LONG] [0]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#10 ]
+        Field=tenk
+      ]
+      Field=tenthous
     ]
+    ]
+    FROM [      Variable [ Name=#5 ]
+      AS Variable [ Name=#10 ]
+    ]
+    Where
+      FieldAccessor [
+        Variable [ Name=#10 ]
+        Field=#6
+      ]
+  )
+]
+  AS Variable [ Name=#5 ]
+  (
+    tenk:=Variable [ Name=$tenk ]
+    #4:=Variable [ Name=#4 ]
+    #6:=Variable [ Name=#6 ]
   )
 OVER (
   ORDER BY
@@ -93,6 +165,26 @@
     =
     LiteralExpr [LONG] [0]
   ]
+Let Variable [ Name=#4 ]
+  :=
+  OperatorExpr [
+    FieldAccessor [
+      Variable [ Name=$tenk ]
+      Field=twothous
+    ]
+    =
+    LiteralExpr [LONG] [0]
+  ]
+Let Variable [ Name=#6 ]
+  :=
+  OperatorExpr [
+    FieldAccessor [
+      Variable [ Name=$tenk ]
+      Field=twothous
+    ]
+    =
+    LiteralExpr [LONG] [0]
+  ]
 Orderby
   FieldAccessor [
     Variable [ Name=$tenk ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.07.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.07.ast
index 48f5c9d..06abed9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.07.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-subclause/agg_filter_01/agg_filter_1.07.ast
@@ -8,66 +8,74 @@
     SELECT ELEMENT [
     FieldAccessor [
       FieldAccessor [
-        Variable [ Name=#2 ]
+        Variable [ Name=#14 ]
         Field=tenk
       ]
       Field=ten
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
+      AS Variable [ Name=#14 ]
     ]
   )
 ]
 sm
-WINDOW test.sum@1[
-  FunctionCall asterix.sql-sum@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        FieldAccessor [
-          Variable [ Name=#3 ]
-          Field=tenk
-        ]
-        Field=ten
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#3 ]
-      ]
-    )
-  ]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      Variable [ Name=#15 ]
+      Field=#3
+    ]
+    ]
+    FROM [      Variable [ Name=#2 ]
+      AS Variable [ Name=#15 ]
+    ]
+  )
 ]
+  AS Variable [ Name=#2 ]
+  (
+    twenty:=Variable [ Name=$twenty ]
+    #1:=Variable [ Name=#1 ]
+    #3:=Variable [ Name=#3 ]
+    #5:=Variable [ Name=#5 ]
+    #6:=Variable [ Name=#6 ]
+    #8:=Variable [ Name=#8 ]
+    #9:=Variable [ Name=#9 ]
+  )
 OVER (
   ORDER BY
     Variable [ Name=$twenty ]
     ASC
 )
 sm_sm
-WINDOW test.sum@1[
-  FunctionCall asterix.sql-sum@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        FieldAccessor [
-          Variable [ Name=#4 ]
-          Field=tenk
-        ]
-        Field=ten
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#4 ]
-      ]
-    )
-  ]
-]
-  FILTER (WHERE
-    OperatorExpr [
-      Variable [ Name=$twenty ]
-      <
-      LiteralExpr [LONG] [10]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      Variable [ Name=#16 ]
+      Field=#6
     ]
+    ]
+    FROM [      Variable [ Name=#4 ]
+      AS Variable [ Name=#16 ]
+    ]
+    Where
+      FieldAccessor [
+        Variable [ Name=#16 ]
+        Field=#5
+      ]
+  )
+]
+  AS Variable [ Name=#4 ]
+  (
+    twenty:=Variable [ Name=$twenty ]
+    #1:=Variable [ Name=#1 ]
+    #3:=Variable [ Name=#3 ]
+    #5:=Variable [ Name=#5 ]
+    #6:=Variable [ Name=#6 ]
+    #8:=Variable [ Name=#8 ]
+    #9:=Variable [ Name=#9 ]
   )
 OVER (
   ORDER BY
@@ -75,45 +83,33 @@
     ASC
 )
 sm_sm_where_twenty_lt_10
-WINDOW test.sum@1[
-  FunctionCall asterix.sql-sum@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        FieldAccessor [
-          Variable [ Name=#5 ]
-          Field=tenk
-        ]
-        Field=ten
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#5 ]
-      ]
-    )
-  ]
-]
-  FILTER (WHERE
-    OperatorExpr [
-      FunctionCall asterix.sql-sum@1[
-        (
-          SELECT ELEMENT [
-          FieldAccessor [
-            FieldAccessor [
-              Variable [ Name=#6 ]
-              Field=tenk
-            ]
-            Field=ten
-          ]
-          ]
-          FROM [            Variable [ Name=#1 ]
-            AS Variable [ Name=#6 ]
-          ]
-        )
-      ]
-      <
-      LiteralExpr [LONG] [3000]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      Variable [ Name=#17 ]
+      Field=#9
     ]
+    ]
+    FROM [      Variable [ Name=#7 ]
+      AS Variable [ Name=#17 ]
+    ]
+    Where
+      FieldAccessor [
+        Variable [ Name=#17 ]
+        Field=#8
+      ]
+  )
+]
+  AS Variable [ Name=#7 ]
+  (
+    twenty:=Variable [ Name=$twenty ]
+    #1:=Variable [ Name=#1 ]
+    #3:=Variable [ Name=#3 ]
+    #5:=Variable [ Name=#5 ]
+    #6:=Variable [ Name=#6 ]
+    #8:=Variable [ Name=#8 ]
+    #9:=Variable [ Name=#9 ]
   )
 OVER (
   ORDER BY
@@ -139,6 +135,89 @@
     tenk:=Variable [ Name=$tenk ]
   )
 
+Let Variable [ Name=#3 ]
+  :=
+  FunctionCall asterix.sql-sum@1[
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#10 ]
+          Field=tenk
+        ]
+        Field=ten
+      ]
+      ]
+      FROM [        Variable [ Name=#1 ]
+        AS Variable [ Name=#10 ]
+      ]
+    )
+  ]
+Let Variable [ Name=#5 ]
+  :=
+  OperatorExpr [
+    Variable [ Name=$twenty ]
+    <
+    LiteralExpr [LONG] [10]
+  ]
+Let Variable [ Name=#6 ]
+  :=
+  FunctionCall asterix.sql-sum@1[
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#11 ]
+          Field=tenk
+        ]
+        Field=ten
+      ]
+      ]
+      FROM [        Variable [ Name=#1 ]
+        AS Variable [ Name=#11 ]
+      ]
+    )
+  ]
+Let Variable [ Name=#8 ]
+  :=
+  OperatorExpr [
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#12 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#12 ]
+        ]
+      )
+    ]
+    <
+    LiteralExpr [LONG] [3000]
+  ]
+Let Variable [ Name=#9 ]
+  :=
+  FunctionCall asterix.sql-sum@1[
+    (
+      SELECT ELEMENT [
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#13 ]
+          Field=tenk
+        ]
+        Field=ten
+      ]
+      ]
+      FROM [        Variable [ Name=#1 ]
+        AS Variable [ Name=#13 ]
+      ]
+    )
+  ]
 Orderby
   Variable [ Name=$twenty ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
index 21cab5a..97164dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number/agg_number.3.ast
@@ -5,10 +5,10 @@
     :
     FunctionCall asterix.count@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -21,10 +21,10 @@
     :
     FunctionCall asterix.avg@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -37,10 +37,10 @@
     :
     FunctionCall asterix.sum@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -53,10 +53,10 @@
     :
     FunctionCall asterix.min@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -69,10 +69,10 @@
     :
     FunctionCall asterix.max@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -85,10 +85,10 @@
     :
     FunctionCall asterix.stddev_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -101,10 +101,10 @@
     :
     FunctionCall asterix.stddev_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -117,10 +117,10 @@
     :
     FunctionCall asterix.var_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -133,10 +133,10 @@
     :
     FunctionCall asterix.var_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -149,10 +149,10 @@
     :
     FunctionCall asterix.skewness@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -165,10 +165,10 @@
     :
     FunctionCall asterix.kurtosis@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -181,10 +181,10 @@
     :
     FunctionCall asterix.count@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -197,10 +197,10 @@
     :
     FunctionCall asterix.avg@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -213,10 +213,10 @@
     :
     FunctionCall asterix.sum@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -229,10 +229,10 @@
     :
     FunctionCall asterix.min@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -245,10 +245,10 @@
     :
     FunctionCall asterix.max@1[
       UnorderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -261,10 +261,10 @@
     :
     FunctionCall asterix.stddev_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -277,10 +277,10 @@
     :
     FunctionCall asterix.stddev_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -293,10 +293,10 @@
     :
     FunctionCall asterix.var_samp@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -309,10 +309,10 @@
     :
     FunctionCall asterix.var_pop@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -325,10 +325,10 @@
     :
     FunctionCall asterix.skewness@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
@@ -341,10 +341,10 @@
     :
     FunctionCall asterix.kurtosis@1[
       OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
-        FunctionCall null.double@1[
+        FunctionCall asterix.double@1[
           LiteralExpr [STRING] [3.0]
         ]
         LiteralExpr [LONG] [93847382783847382]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.4.ast
index c6e5f00..486f5ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double/avg_double.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.4.ast
index b5910c3..c35af94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
index be4e9f4..c8a1c1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -30,6 +30,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.4.ast
index e388212..227a847 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float/avg_float.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_null.4.ast
index a27474e..d87565d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.4.ast
index 93ac851..cfaf11d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16/avg_int16.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.4.ast
index a8eeec5..96d8472 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.4.ast
index 305ef7b..0d6873c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32/avg_int32.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.4.ast
index 342ef66..59cdebd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.4.ast
index d81470b..cd1ca5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64/avg_int64.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.4.ast
index f6e324a..c6a4275 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.4.ast
index a42531f..9645d36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8/avg_int8.4.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-WINDOW test.strict_avg@1[
+WINDOW asterix.avg@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -18,6 +18,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.4.ast
index d39b019..1b61a4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.4.ast
@@ -6,7 +6,7 @@
     :
     (
       SELECT ELEMENT [
-      WINDOW test.strict_avg@1[
+      WINDOW asterix.avg@1[
         (
           SELECT ELEMENT [
           FieldAccessor [
@@ -23,6 +23,9 @@
         )
       ]
         AS Variable [ Name=$w ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
index 750ac9b..73c7ade 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_mixed/avg_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
index 802040d..e472793 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_mixed/min_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
index 1049f33..187e742 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg/scalar_avg.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
index 7e062bb..0e200eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.avg@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
index bbd01a0..0721a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count/scalar_count.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
index 56e6061..395e913 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.count@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
index ccc7579..1643023 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max/scalar_max.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -103,13 +103,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
index de3f4ca..ce0ddd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -110,13 +110,13 @@
   :=
   FunctionCall asterix.max@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
index 0aa087f..e0baf2a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min/scalar_min.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -103,13 +103,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
index 3346789..c2e2783 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_min_null/scalar_min_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -110,13 +110,13 @@
   :=
   FunctionCall asterix.min@1[
     OrderedListConstructor [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-03-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-02-01T00:00:00Z]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
index 58bb3ca..defe2fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum/scalar_sum.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -19,13 +19,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -34,13 +34,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -49,13 +49,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -64,13 +64,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -79,13 +79,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
index 30cccae..87d6e04 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.ast
@@ -4,13 +4,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -20,13 +20,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -36,13 +36,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -52,13 +52,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -68,13 +68,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
@@ -84,13 +84,13 @@
   :=
   FunctionCall asterix.sum@1[
     OrderedListConstructor [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2]
       ]
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
index f391452..8ca6b1b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float/sum_float.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
index 18be6bb..789e221 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16/sum_int16.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int16@1[
+        FunctionCall asterix.int16@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
index df28ba6..7677d97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32/sum_int32.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int32@1[
+        FunctionCall asterix.int32@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
index c9652ea..fba72d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64/sum_int64.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [1]
         ]
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [2]
         ]
-        FunctionCall test.int64@1[
+        FunctionCall asterix.int64@1[
           LiteralExpr [STRING] [3]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
index 8cd57a7..121702c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8/sum_int8.3.ast
@@ -7,13 +7,13 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
-        FunctionCall test.int8@1[
+        FunctionCall asterix.int8@1[
           LiteralExpr [STRING] [100]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
index e849c4e..471fbe0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_mixed/sum_mixed.3.ast
@@ -6,12 +6,12 @@
     Variable [ Name=$x ]
     ]
     FROM [      OrderedListConstructor [
-        FunctionCall null.float@1[
+        FunctionCall asterix.float@1[
           LiteralExpr [STRING] [2.0]
         ]
         LiteralExpr [STRING] [hello world]
         LiteralExpr [LONG] [93847382783847382]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
index 7ec7ccb..894dcb7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [length]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       Variable [ Name=$comment ]
     ]
   )
@@ -47,7 +47,7 @@
 Orderby
   Variable [ Name=$id ]
   ASC
-  FunctionCall test.string-length@1[
+  FunctionCall asterix.string-length@1[
     Variable [ Name=$comment ]
   ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
index 1fa4750..483250c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
@@ -21,7 +21,7 @@
   (
     LiteralExpr [STRING] [len_c_comment]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$c ]
         Field=c_comment
@@ -31,7 +31,7 @@
   (
     LiteralExpr [STRING] [len_o_comment]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=o_comment
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
index 8ef1dc5..31b8b5b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
@@ -21,7 +21,7 @@
   (
     LiteralExpr [STRING] [len-comment]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=o_comment
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/concat/concat_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/concat/concat_01.3.ast
index b481603..2bd7c50 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/concat/concat_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/concat/concat_01.3.ast
@@ -2,65 +2,65 @@
 Query:
 OrderedListConstructor [
   OperatorExpr [
-    FunctionCall test.binary-concat@1[
+    FunctionCall asterix.binary-concat@1[
       OrderedListConstructor [
-        FunctionCall test.hex@1[
+        FunctionCall asterix.hex@1[
           LiteralExpr [STRING] [aa]
         ]
-        FunctionCall test.hex@1[
+        FunctionCall asterix.hex@1[
           LiteralExpr [STRING] [259911]
         ]
-        FunctionCall test.hex@1[
+        FunctionCall asterix.hex@1[
           LiteralExpr [STRING] [bb]
         ]
-        FunctionCall test.hex@1[
+        FunctionCall asterix.hex@1[
           LiteralExpr [STRING] [31]
         ]
       ]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [AA259911bb31]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.binary-concat@1[
+    FunctionCall asterix.binary-concat@1[
       OrderedListConstructor [
       ]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
-  FunctionCall test.binary-concat@1[
+  FunctionCall asterix.binary-concat@1[
     OrderedListConstructor [
       LiteralExpr [NULL]
     ]
   ]
-  FunctionCall test.binary-concat@1[
+  FunctionCall asterix.binary-concat@1[
     OrderedListConstructor [
       LiteralExpr [NULL]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [55]
       ]
     ]
   ]
-  FunctionCall test.binary-concat@1[
+  FunctionCall asterix.binary-concat@1[
     OrderedListConstructor [
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aa]
       ]
       LiteralExpr [NULL]
     ]
   ]
-  FunctionCall test.binary-concat@1[
+  FunctionCall asterix.binary-concat@1[
     OrderedListConstructor [
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aa]
       ]
       LiteralExpr [NULL]
-      FunctionCall test.base64@1[
+      FunctionCall asterix.base64@1[
         LiteralExpr [STRING] [asdf]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
index 813591c..c24ad58 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/find/find.3.ast
@@ -2,11 +2,11 @@
 Query:
 OrderedListConstructor [
   OperatorExpr [
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] []
       ]
     ]
@@ -14,11 +14,11 @@
     LiteralExpr [LONG] [0]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aa]
       ]
     ]
@@ -26,11 +26,11 @@
     LiteralExpr [LONG] [0]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aa]
       ]
       LiteralExpr [LONG] [1]
@@ -39,31 +39,31 @@
     LiteralExpr [LONG] [4]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabb]
       ]
       - LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabb]
       ]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [11]
       ]
     ]
@@ -71,11 +71,11 @@
     - LiteralExpr [LONG] [1]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [ccddaa]
       ]
     ]
@@ -83,30 +83,30 @@
     LiteralExpr [LONG] [2]
   ]
   OperatorExpr [
-    FunctionCall test.find-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.find-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccddaa]
       ]
-      FunctionCall test.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [ccddaabb]
       ]
     ]
     =
     - LiteralExpr [LONG] [1]
   ]
-  FunctionCall test.find-binary@2[
-    FunctionCall test.hex@1[
+  FunctionCall asterix.find-binary@2[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccddaa]
     ]
     LiteralExpr [NULL]
   ]
-  FunctionCall test.find-binary@2[
+  FunctionCall asterix.find-binary@2[
     LiteralExpr [NULL]
     LiteralExpr [NULL]
   ]
-  FunctionCall test.find-binary@2[
+  FunctionCall asterix.find-binary@2[
     LiteralExpr [NULL]
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccddaa]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/length/length.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/length/length.3.ast
index 8942f96..c8d1db6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/length/length.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/length/length.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.binary-length@1[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.binary-length@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [00AA]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.binary-length@1[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.binary-length@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] []
       ]
     ]
@@ -22,7 +22,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.binary-length@1[
+    FunctionCall asterix.binary-length@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/parse/parse.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/parse/parse.3.ast
index 5613753..99ffffd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/parse/parse.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/parse/parse.3.ast
@@ -1,43 +1,43 @@
 DataverseUse test
 Query:
 OrderedListConstructor [
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [ABCDEF0123456789]
     LiteralExpr [STRING] [hex]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [abcdef0123456789]
     LiteralExpr [STRING] [HEX]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [0A0B0C0D0E0F]
     LiteralExpr [STRING] [hEx]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [01020304050607080900]
     LiteralExpr [STRING] [hex]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] []
     LiteralExpr [STRING] [hex]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM+/]
     LiteralExpr [STRING] [base64]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] []
     LiteralExpr [STRING] [base64]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [QXN0ZXJpeA==]
     LiteralExpr [STRING] [BASE64]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [QXN0ZXJpeAE=]
     LiteralExpr [STRING] [baSE64]
   ]
-  FunctionCall test.parse-binary@2[
+  FunctionCall asterix.parse-binary@2[
     LiteralExpr [STRING] [QXN0ZXJpeAE8]
     LiteralExpr [STRING] [base64]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
index 91609e5..e42bb37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/print/print.3.ast
@@ -7,8 +7,8 @@
     (
       SELECT ELEMENT [
       OperatorExpr [
-        FunctionCall test.print-binary@2[
-          FunctionCall test.parse-binary@2[
+        FunctionCall asterix.print-binary@2[
+          FunctionCall asterix.parse-binary@2[
             Variable [ Name=$i ]
             LiteralExpr [STRING] [hex]
           ]
@@ -34,8 +34,8 @@
     (
       SELECT ELEMENT [
       OperatorExpr [
-        FunctionCall test.print-binary@2[
-          FunctionCall test.parse-binary@2[
+        FunctionCall asterix.print-binary@2[
+          FunctionCall asterix.parse-binary@2[
             Variable [ Name=$j ]
             LiteralExpr [STRING] [base64]
           ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
index 5a232ae..4c52f44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/subbinary/subbinary_01.3.ast
@@ -2,182 +2,182 @@
 Query:
 OrderedListConstructor [
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] []
       ]
       LiteralExpr [LONG] [0]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] []
       ]
       LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] []
       ]
       - LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [0]
-      FunctionCall test.binary-length@1[
-        FunctionCall test.hex@1[
+      FunctionCall asterix.binary-length@1[
+        FunctionCall asterix.hex@1[
           LiteralExpr [STRING] [aabbccdd]
         ]
       ]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [bb]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [bbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [4]
       LiteralExpr [LONG] [0]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [3]
       LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [dd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [bbcc]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [0]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@2[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@2[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       - LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [256]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [aabbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [256]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [bbccdd]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.sub-binary@3[
-      FunctionCall test.hex@1[
+    FunctionCall asterix.sub-binary@3[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [aabbccdd]
       ]
       LiteralExpr [LONG] [1]
       - LiteralExpr [LONG] [1]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] []
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
index 85aa549..04666b2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/and_01/and_01.3.ast
@@ -1,11 +1,11 @@
 DataverseUse test
 Query:
 OperatorExpr [
-  FunctionCall test.boolean@1[
+  FunctionCall asterix.boolean@1[
     LiteralExpr [STRING] [true]
   ]
   and
-  FunctionCall test.boolean@1[
+  FunctionCall asterix.boolean@1[
     LiteralExpr [STRING] [false]
   ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary/binary.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary/binary.3.ast
index 854f0ba..ba2bef5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary/binary.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary/binary.3.ast
@@ -2,146 +2,146 @@
 Query:
 OrderedListConstructor [
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     >
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     >=
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     <
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     <=
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     =
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     !=
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     >
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     >=
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     <
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     <=
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     =
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
     !=
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     =
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
     =
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0A0A]
     ]
     =
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cw==]
     ]
   ]
   OperatorExpr [
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [0B]
     ]
     =
-    FunctionCall test.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [Cgo=]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.1.ast
index ee79f0c..03c8b0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/binary_null/binary_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.hex@1[
+      FunctionCall asterix.hex@1[
         LiteralExpr [STRING] [AA]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
index 491637d..8cf70af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_order/datetime_order.3.ast
@@ -2,57 +2,57 @@
 Query:
 Let Variable [ Name=$dt1 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2011-12-31T14:00:00-10:00]
   ]
 Let Variable [ Name=$dt2 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2012-01-01T00:00:00Z]
   ]
 Let Variable [ Name=$dt3 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2005-01-01T00:00:00+04:00]
   ]
 Let Variable [ Name=$dt4 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2011-12-31T13:00:00-11:00]
   ]
 Let Variable [ Name=$dt5 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2012-04-06T00:00:00Z]
   ]
 Let Variable [ Name=$dt6 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [-1937-07-07T23:00:00+08:00]
   ]
 Let Variable [ Name=$dt7 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [-1600-03-01T00:00:00.384+06:00]
   ]
 Let Variable [ Name=$dt8 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [-1600-02-29T23:59:59.999Z]
   ]
 Let Variable [ Name=$dt9 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2000-02-29T23:59:59.999Z]
   ]
 Let Variable [ Name=$dt10 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [2000-03-01T01:59:59.999+07:00]
   ]
 Let Variable [ Name=$dt11 ]
   :=
-  FunctionCall test.datetime@1[
+  FunctionCall asterix.datetime@1[
     LiteralExpr [STRING] [-1600-03-01T00:00:00.384-06:00]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
index f9148b3..fdce3c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
@@ -25,7 +25,7 @@
         Field=time
       ]
       >
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-05-15T16:00:00Z]
       ]
     ]
@@ -36,7 +36,7 @@
         Field=time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-05-15T21:59:59Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_tzeq/datetime_tzeq.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_tzeq/datetime_tzeq.3.ast
index 2cef895..2431972 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_tzeq/datetime_tzeq.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_tzeq/datetime_tzeq.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-12-31T14:00:00-10:00]
       ]
       =
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-01-01T00:00:00Z]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2000-03-01T02:00:00+04:00]
       ]
       =
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2000-02-29T22:00:00Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double/double.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double/double.3.ast
index 2cea57c..fae7ef1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double/double.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double/double.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       <
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       <=
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.1.ast
index 4b99024..922f419 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/double_null/double_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float/float.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float/float.3.ast
index 4e4c32a..5193a2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float/float.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float/float.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       <
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       <=
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.1.ast
index 42c1496..c200a75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/float_null/float_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16/int16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16/int16.3.ast
index d13d5f5..d995083 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16/int16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16/int16.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       <
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       <=
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.1.ast
index 5573145..21428e8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int16_null/int16_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32/int32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32/int32.3.ast
index 5be4493..07c6a1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32/int32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32/int32.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       <
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       <=
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.1.ast
index c73d562..23bb974 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int32_null/int32_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64/int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64/int64.3.ast
index d6bf81b..08cb2be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64/int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64/int64.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       <=
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       <
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.1.ast
index 0866ec0..822579c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int64_null/int64_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8/int8.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8/int8.3.ast
index 1580aee..c98865f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8/int8.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8/int8.3.ast
@@ -5,11 +5,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       >
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -18,11 +18,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       >=
-      FunctionCall test.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       <
-      FunctionCall test.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -44,11 +44,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       <=
-      FunctionCall test.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -57,11 +57,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       =
-      FunctionCall test.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -70,11 +70,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall test.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       !=
-      FunctionCall test.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.1.ast
index 82e3aae..e4d4e38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/int8_null/int8_null.1.ast
@@ -4,7 +4,7 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       >
@@ -17,7 +17,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       >=
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -26,7 +26,7 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       <
@@ -39,7 +39,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       <=
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
@@ -48,7 +48,7 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
       =
@@ -61,7 +61,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       !=
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [3]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_equality/issue363_equality.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_equality/issue363_equality.3.ast
index 5bf9603..edbbefb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_equality/issue363_equality.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_equality/issue363_equality.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [duration]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
       =
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [year-month-duration]
     :
     OperatorExpr [
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P3Y6M]
       ]
       =
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P3Y6M]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [day-time-duration]
     :
     OperatorExpr [
-      FunctionCall null.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P3DT9H5M2.348S]
       ]
       =
-      FunctionCall null.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P3DT9H5M2.348S]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [point]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
       =
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [line]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       =
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [polygon]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       =
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
@@ -82,11 +82,11 @@
     LiteralExpr [STRING] [circle]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
       =
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
     ]
@@ -95,11 +95,11 @@
     LiteralExpr [STRING] [rectangle]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
       =
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
     ]
@@ -108,20 +108,20 @@
     LiteralExpr [STRING] [interval]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       =
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
@@ -131,11 +131,11 @@
     LiteralExpr [STRING] [duration2]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
       !=
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P4Y6M3DT9H5M2.348S]
       ]
     ]
@@ -144,11 +144,11 @@
     LiteralExpr [STRING] [year-month-duration2]
     :
     OperatorExpr [
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P3Y6M]
       ]
       !=
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P3Y7M]
       ]
     ]
@@ -157,11 +157,11 @@
     LiteralExpr [STRING] [day-time-duration2]
     :
     OperatorExpr [
-      FunctionCall null.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P3DT9H5M2.348S]
       ]
       !=
-      FunctionCall null.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P3DT1H5M2.348S]
       ]
     ]
@@ -170,11 +170,11 @@
     LiteralExpr [STRING] [point2]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
       !=
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.4444,80.65]
       ]
     ]
@@ -183,11 +183,11 @@
     LiteralExpr [STRING] [line2]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       !=
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.5678,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
@@ -196,11 +196,11 @@
     LiteralExpr [STRING] [polygon2]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       !=
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
@@ -209,11 +209,11 @@
     LiteralExpr [STRING] [circle2]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
       !=
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 +10.5E-2]
       ]
     ]
@@ -222,11 +222,11 @@
     LiteralExpr [STRING] [rectangle2]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
       !=
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 5.5487,0.48765]
       ]
     ]
@@ -235,20 +235,20 @@
     LiteralExpr [STRING] [interval2]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       !=
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1983-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_circle/issue363_inequality_circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_circle/issue363_inequality_circle.3.ast
index 968e627..4134cc4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_circle/issue363_inequality_circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_circle/issue363_inequality_circle.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [circle0]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
       >
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 +10.5E-2]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [circle1]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 +10.5E-2]
       ]
       <
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [circle2]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
       >=
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 +10.5E-2]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [circle3]
     :
     OperatorExpr [
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 +10.5E-2]
       ]
       <=
-      FunctionCall null.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_duration/issue363_inequality_duration.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_duration/issue363_inequality_duration.3.ast
index 49251c6..b306672 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_duration/issue363_inequality_duration.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_duration/issue363_inequality_duration.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [duration0]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y6M3DT9H5M2.348S]
       ]
       >
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [duration1]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
       <
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y6M3DT9H5M2.348S]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [duration2]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y6M3DT9H5M2.348S]
       ]
       >=
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [duration3]
     :
     OperatorExpr [
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y6M3DT9H5M2.348S]
       ]
       <=
-      FunctionCall null.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y6M3DT9H5M2.348S]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_interval/issue363_inequality_interval.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_interval/issue363_inequality_interval.3.ast
index e59b50f..8b99251 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_interval/issue363_inequality_interval.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_interval/issue363_inequality_interval.3.ast
@@ -4,20 +4,20 @@
     LiteralExpr [STRING] [interval0]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       >
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1983-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
@@ -27,20 +27,20 @@
     LiteralExpr [STRING] [interval1]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1983-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       <
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
@@ -50,20 +50,20 @@
     LiteralExpr [STRING] [interval2]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       >=
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1983-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
@@ -73,20 +73,20 @@
     LiteralExpr [STRING] [interval3]
     :
     OperatorExpr [
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1983-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
       <=
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [19991112T124935948-0700]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_line/issue363_inequality_line.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_line/issue363_inequality_line.3.ast
index 12ca8bd..8a41c81 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_line/issue363_inequality_line.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_line/issue363_inequality_line.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [line0]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       >
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [line1]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       <
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [line2]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       >=
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [line3]
     :
     OperatorExpr [
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
       <=
-      FunctionCall null.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_point/issue363_inequality_point.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_point/issue363_inequality_point.3.ast
index 23b6cbc..fc8dace 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_point/issue363_inequality_point.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_point/issue363_inequality_point.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [point0]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
       >
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.4444,80.65]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [point1]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.4444,80.65]
       ]
       <
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [point2]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
       >=
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.4444,80.65]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [point3]
     :
     OperatorExpr [
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.4444,80.65]
       ]
       <=
-      FunctionCall null.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [47.44,80.65]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_polygon/issue363_inequality_polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_polygon/issue363_inequality_polygon.3.ast
index 6bf50b5..f4f1cb9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_polygon/issue363_inequality_polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_polygon/issue363_inequality_polygon.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [polygon0]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       >
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [polygon1]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       <
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [polygon2]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       >=
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [polygon3]
     :
     OperatorExpr [
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.19E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
       <=
-      FunctionCall null.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_rectangle/issue363_inequality_rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_rectangle/issue363_inequality_rectangle.3.ast
index ba93efa..241edf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_rectangle/issue363_inequality_rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/issue363_inequality_rectangle/issue363_inequality_rectangle.3.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [rectangle0]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
       >
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 5.5487,0.48765]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [rectangle1]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 5.5487,0.48765]
       ]
       <
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [rectangle2]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
       >=
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 5.5487,0.48765]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [rectangle3]
     :
     OperatorExpr [
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.5678,-1.00e-10 5.5487,0.48765]
       ]
       <=
-      FunctionCall null.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
index 3d1f63c..955c22c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/year_month_duration_order/year_month_duration_order.3.ast
@@ -2,22 +2,22 @@
 Query:
 Let Variable [ Name=$dr1 ]
   :=
-  FunctionCall test.year-month-duration@1[
+  FunctionCall asterix.year-month-duration@1[
     LiteralExpr [STRING] [P439Y]
   ]
 Let Variable [ Name=$dr2 ]
   :=
-  FunctionCall test.year-month-duration@1[
+  FunctionCall asterix.year-month-duration@1[
     LiteralExpr [STRING] [-P328M]
   ]
 Let Variable [ Name=$dr3 ]
   :=
-  FunctionCall test.year-month-duration@1[
+  FunctionCall asterix.year-month-duration@1[
     LiteralExpr [STRING] [-P48Y12M]
   ]
 Let Variable [ Name=$dr4 ]
   :=
-  FunctionCall test.year-month-duration@1[
+  FunctionCall asterix.year-month-duration@1[
     LiteralExpr [STRING] [P12M]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/binary_01/binary_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/binary_01/binary_01.3.ast
index f099319..a4d112a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/binary_01/binary_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/binary_01/binary_01.3.ast
@@ -1,43 +1,43 @@
 DataverseUse test
 Query:
 OrderedListConstructor [
-  FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
     LiteralExpr [STRING] [ABCDEF0123456789]
   ]
-  FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
     LiteralExpr [STRING] [abcdef0123456789]
   ]
-  FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
     LiteralExpr [STRING] [0A0B0C0D0E0F]
   ]
-  FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
     LiteralExpr [STRING] [01020304050607080900]
   ]
-  FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
     LiteralExpr [STRING] []
   ]
-  FunctionCall test.hex@1[
-    FunctionCall test.hex@1[
+  FunctionCall asterix.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [ABCDEF0123456789]
     ]
   ]
-  FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
     LiteralExpr [STRING] [0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM+/]
   ]
-  FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
     LiteralExpr [STRING] []
   ]
-  FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
     LiteralExpr [STRING] [QXN0ZXJpeA==]
   ]
-  FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
     LiteralExpr [STRING] [QXN0ZXJpeAE=]
   ]
-  FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
     LiteralExpr [STRING] [QXN0ZXJpeAE8]
   ]
-  FunctionCall test.base64@1[
-    FunctionCall test.base64@1[
+  FunctionCall asterix.base64@1[
+    FunctionCall asterix.base64@1[
       LiteralExpr [STRING] [QXN0ZXJpeAE8]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/boolean_01/boolean_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/boolean_01/boolean_01.3.ast
index f247b92..f2b6571 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/boolean_01/boolean_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/boolean_01/boolean_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [boolean1]
     :
-    FunctionCall test.boolean@1[
+    FunctionCall asterix.boolean@1[
       LiteralExpr [STRING] [true]
     ]
   )
   (
     LiteralExpr [STRING] [boolean2]
     :
-    FunctionCall test.boolean@1[
+    FunctionCall asterix.boolean@1[
       LiteralExpr [STRING] [false]
     ]
   )
   (
     LiteralExpr [STRING] [boolean3]
     :
-    FunctionCall test.boolean@1[
-      FunctionCall test.boolean@1[
+    FunctionCall asterix.boolean@1[
+      FunctionCall asterix.boolean@1[
         LiteralExpr [STRING] [false]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/circle_01/circle_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/circle_01/circle_01.3.ast
index f8be79e..66f3752 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/circle_01/circle_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/circle_01/circle_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [circle1]
     :
-    FunctionCall test.circle@1[
+    FunctionCall asterix.circle@1[
       LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2]
     ]
   )
   (
     LiteralExpr [STRING] [circle2]
     :
-    FunctionCall test.circle@1[
+    FunctionCall asterix.circle@1[
       LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
     ]
   )
   (
     LiteralExpr [STRING] [circle3]
     :
-    FunctionCall test.circle@1[
-      FunctionCall test.circle@1[
+    FunctionCall asterix.circle@1[
+      FunctionCall asterix.circle@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/date_01/date_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/date_01/date_01.3.ast
index b54c957..93eda8c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/date_01/date_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/date_01/date_01.3.ast
@@ -4,78 +4,78 @@
   (
     LiteralExpr [STRING] [date1]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-10-30]
     ]
   )
   (
     LiteralExpr [STRING] [date2]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [1987-11-19]
     ]
   )
   (
     LiteralExpr [STRING] [date3]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [-1987-11-19]
     ]
   )
   (
     LiteralExpr [STRING] [date4]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [0001-12-27]
     ]
   )
   (
     LiteralExpr [STRING] [date5]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [-1951-12-27]
     ]
   )
   (
     LiteralExpr [STRING] [date6]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [-2043-11-19]
     ]
   )
   (
     LiteralExpr [STRING] [date7]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [-19280329]
     ]
   )
   (
     LiteralExpr [STRING] [date8]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [19280329]
     ]
   )
   (
     LiteralExpr [STRING] [date9]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [19000228]
     ]
   )
   (
     LiteralExpr [STRING] [date10]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [20000229]
     ]
   )
   (
     LiteralExpr [STRING] [date11]
     :
-    FunctionCall test.date@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [20000229]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/datetime_01/datetime_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/datetime_01/datetime_01.3.ast
index 7b80fb1..cbe87ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/datetime_01/datetime_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/datetime_01/datetime_01.3.ast
@@ -4,106 +4,106 @@
   (
     LiteralExpr [STRING] [datetime1]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2010-10-30T10:50:56.999+05:45]
     ]
   )
   (
     LiteralExpr [STRING] [datetime2]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2010-10-30T10:30:56.250-10:00]
     ]
   )
   (
     LiteralExpr [STRING] [datetime3]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [1987-11-19T09:20:00.200Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime4]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [1987-11-19T10:50:56Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime5]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-1987-11-19T10:50:56.099-05:30]
     ]
   )
   (
     LiteralExpr [STRING] [datetime6]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-0001-11-19T10:50:56.719Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime7]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [1951-12-27T12:20:15Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime8]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2043-11-19T10:50:56.719Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime9]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280329T174937374-0630]
     ]
   )
   (
     LiteralExpr [STRING] [datetime10]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280329T174937374+0630]
     ]
   )
   (
     LiteralExpr [STRING] [datetime11]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280329T174937374]
     ]
   )
   (
     LiteralExpr [STRING] [datetime12]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280329T174937374+0630]
     ]
   )
   (
     LiteralExpr [STRING] [datetime13]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280329T17493737+0630]
     ]
   )
   (
     LiteralExpr [STRING] [datetime14]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19280301T05493737+0630]
     ]
   )
   (
     LiteralExpr [STRING] [datetime15]
     :
-    FunctionCall test.datetime@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-19280301T05493737+0630]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/double_01/double_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/double_01/double_01.3.ast
index 903775c..ef36c04 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/double_01/double_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/double_01/double_01.3.ast
@@ -4,50 +4,50 @@
   (
     LiteralExpr [STRING] [double1]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [NaN]
     ]
   )
   (
     LiteralExpr [STRING] [double2]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [INF]
     ]
   )
   (
     LiteralExpr [STRING] [double3]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [-INF]
     ]
   )
   (
     LiteralExpr [STRING] [double4]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [-80.20d]
     ]
   )
   (
     LiteralExpr [STRING] [double5]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [-20.56e-30]
     ]
   )
   (
     LiteralExpr [STRING] [double6]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [-20.56e-300]
     ]
   )
   (
     LiteralExpr [STRING] [double7]
     :
-    FunctionCall test.double@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.56e-300]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_01/duration_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_01/duration_01.3.ast
index 566d8d2..d65e33c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_01/duration_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_01/duration_01.3.ast
@@ -4,92 +4,92 @@
   (
     LiteralExpr [STRING] [duration1]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P30Y10M25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration2]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration3]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [PT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration4]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P30YT12MS]
     ]
   )
   (
     LiteralExpr [STRING] [duration5]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [PT13H]
     ]
   )
   (
     LiteralExpr [STRING] [duration6]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [-P30Y10M25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration7]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [-P25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration8]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [-PT13H50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration9]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P120D]
     ]
   )
   (
     LiteralExpr [STRING] [duration10]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [-P28M]
     ]
   )
   (
     LiteralExpr [STRING] [duration11]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [PT29M90.937S]
     ]
   )
   (
     LiteralExpr [STRING] [duration12]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P300Y15M60DT300H98M482.435S]
     ]
   )
   (
     LiteralExpr [STRING] [duration13]
     :
-    FunctionCall test.duration@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y15M60DT300H98M482.435S]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_02/duration_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_02/duration_02.3.ast
index 5ef3343..e615b56 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_02/duration_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/duration_02/duration_02.3.ast
@@ -4,92 +4,92 @@
   (
     LiteralExpr [STRING] [duration1]
     :
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [P30Y10M]
     ]
   )
   (
     LiteralExpr [STRING] [duration2]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [P25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration3]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration4]
     :
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [P30Y]
     ]
   )
   (
     LiteralExpr [STRING] [duration5]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT13H]
     ]
   )
   (
     LiteralExpr [STRING] [duration6]
     :
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [-P30Y10M]
     ]
   )
   (
     LiteralExpr [STRING] [duration7]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [-P25DT13H12M50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration8]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [-PT13H50S]
     ]
   )
   (
     LiteralExpr [STRING] [duration9]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [P120D]
     ]
   )
   (
     LiteralExpr [STRING] [duration10]
     :
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [-P28M]
     ]
   )
   (
     LiteralExpr [STRING] [duration11]
     :
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT29M90.937S]
     ]
   )
   (
     LiteralExpr [STRING] [duration12]
     :
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [P300Y15M]
     ]
   )
   (
     LiteralExpr [STRING] [duration13]
     :
-    FunctionCall test.year-month-duration@1[
-      FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P300Y15M]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/float_01/float_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/float_01/float_01.3.ast
index caf9745..6a8e42b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/float_01/float_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/float_01/float_01.3.ast
@@ -4,43 +4,43 @@
   (
     LiteralExpr [STRING] [float1]
     :
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [NaN]
     ]
   )
   (
     LiteralExpr [STRING] [float2]
     :
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [INF]
     ]
   )
   (
     LiteralExpr [STRING] [float3]
     :
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [-INF]
     ]
   )
   (
     LiteralExpr [STRING] [float4]
     :
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [-80.20]
     ]
   )
   (
     LiteralExpr [STRING] [float5]
     :
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [-20.56e-30]
     ]
   )
   (
     LiteralExpr [STRING] [float6]
     :
-    FunctionCall test.float@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/int_01/int_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/int_01/int_01.3.ast
index 1ee39a1..e346cec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/int_01/int_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/int_01/int_01.3.ast
@@ -4,71 +4,71 @@
   (
     LiteralExpr [STRING] [int8]
     :
-    FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [+80i8]
     ]
   )
   (
     LiteralExpr [STRING] [int16]
     :
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [160]
     ]
   )
   (
     LiteralExpr [STRING] [int32]
     :
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [+320i32]
     ]
   )
   (
     LiteralExpr [STRING] [int64]
     :
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [640]
     ]
   )
   (
     LiteralExpr [STRING] [int8_2]
     :
-    FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [-80]
     ]
   )
   (
     LiteralExpr [STRING] [int16_2]
     :
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [-160i16]
     ]
   )
   (
     LiteralExpr [STRING] [int32_2]
     :
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [-320]
     ]
   )
   (
     LiteralExpr [STRING] [int64_2]
     :
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [-640i64]
     ]
   )
   (
     LiteralExpr [STRING] [int64_min]
     :
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [-9223372036854775808]
     ]
   )
   (
     LiteralExpr [STRING] [int8_3]
     :
-    FunctionCall test.int8@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+80i8]
       ]
     ]
@@ -76,8 +76,8 @@
   (
     LiteralExpr [STRING] [int16_3]
     :
-    FunctionCall test.int16@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [160]
       ]
     ]
@@ -85,8 +85,8 @@
   (
     LiteralExpr [STRING] [int32_3]
     :
-    FunctionCall test.int32@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+320i32]
       ]
     ]
@@ -94,8 +94,8 @@
   (
     LiteralExpr [STRING] [int64_3]
     :
-    FunctionCall test.int64@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [640]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
index c993fe1..600bdee 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/interval/interval.3.ast
@@ -4,11 +4,11 @@
   (
     LiteralExpr [STRING] [interval41]
     :
-    FunctionCall test.interval-start-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-start-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [0001-12-27]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y394DT48H398.483S]
       ]
     ]
@@ -16,9 +16,9 @@
   (
     LiteralExpr [STRING] [interval42]
     :
-    FunctionCall test.interval-start-from-date@2[
+    FunctionCall asterix.interval-start-from-date@2[
       LiteralExpr [STRING] [0001-12-27]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y394DT48H398.483S]
       ]
     ]
@@ -26,8 +26,8 @@
   (
     LiteralExpr [STRING] [interval43]
     :
-    FunctionCall test.interval-start-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-start-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [0001-12-27]
       ]
       LiteralExpr [STRING] [P3Y394DT48H398.483S]
@@ -36,7 +36,7 @@
   (
     LiteralExpr [STRING] [interval44]
     :
-    FunctionCall test.interval-start-from-date@2[
+    FunctionCall asterix.interval-start-from-date@2[
       LiteralExpr [STRING] [0001-12-27]
       LiteralExpr [STRING] [P3Y394DT48H398.483S]
     ]
@@ -44,9 +44,9 @@
   (
     LiteralExpr [STRING] [interval45]
     :
-    FunctionCall test.interval-start-from-date@2[
+    FunctionCall asterix.interval-start-from-date@2[
       LiteralExpr [NULL]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y394DT48H398.483S]
       ]
     ]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [interval46]
     :
-    FunctionCall test.interval-start-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-start-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [0001-12-27]
       ]
       LiteralExpr [NULL]
@@ -64,11 +64,11 @@
   (
     LiteralExpr [STRING] [interval51]
     :
-    FunctionCall test.interval-start-from-time@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval-start-from-time@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [20:03:20.948]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P60DT48M389.938S]
       ]
     ]
@@ -76,9 +76,9 @@
   (
     LiteralExpr [STRING] [interval52]
     :
-    FunctionCall test.interval-start-from-time@2[
+    FunctionCall asterix.interval-start-from-time@2[
       LiteralExpr [STRING] [20:03:20.948]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P60DT48M389.938S]
       ]
     ]
@@ -86,8 +86,8 @@
   (
     LiteralExpr [STRING] [interval53]
     :
-    FunctionCall test.interval-start-from-time@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval-start-from-time@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [20:03:20.948]
       ]
       LiteralExpr [STRING] [P60DT48M389.938S]
@@ -96,7 +96,7 @@
   (
     LiteralExpr [STRING] [interval54]
     :
-    FunctionCall test.interval-start-from-time@2[
+    FunctionCall asterix.interval-start-from-time@2[
       LiteralExpr [STRING] [20:03:20.948]
       LiteralExpr [STRING] [P60DT48M389.938S]
     ]
@@ -104,9 +104,9 @@
   (
     LiteralExpr [STRING] [interval55]
     :
-    FunctionCall test.interval-start-from-time@2[
+    FunctionCall asterix.interval-start-from-time@2[
       LiteralExpr [NULL]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P60DT48M389.938S]
       ]
     ]
@@ -114,8 +114,8 @@
   (
     LiteralExpr [STRING] [interval56]
     :
-    FunctionCall test.interval-start-from-time@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval-start-from-time@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [20:03:20.948]
       ]
       LiteralExpr [NULL]
@@ -124,11 +124,11 @@
   (
     LiteralExpr [STRING] [interval61]
     :
-    FunctionCall test.interval-start-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval-start-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-2043-11-19T15:32:39.293]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P439Y3M20DT20H39M58.949S]
       ]
     ]
@@ -136,9 +136,9 @@
   (
     LiteralExpr [STRING] [interval62]
     :
-    FunctionCall test.interval-start-from-datetime@2[
+    FunctionCall asterix.interval-start-from-datetime@2[
       LiteralExpr [STRING] [-2043-11-19T15:32:39.293]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P439Y3M20DT20H39M58.949S]
       ]
     ]
@@ -146,8 +146,8 @@
   (
     LiteralExpr [STRING] [interval63]
     :
-    FunctionCall test.interval-start-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval-start-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-2043-11-19T15:32:39.293]
       ]
       LiteralExpr [STRING] [P439Y3M20DT20H39M58.949S]
@@ -156,7 +156,7 @@
   (
     LiteralExpr [STRING] [interval64]
     :
-    FunctionCall test.interval-start-from-datetime@2[
+    FunctionCall asterix.interval-start-from-datetime@2[
       LiteralExpr [STRING] [-2043-11-19T15:32:39.293]
       LiteralExpr [STRING] [P439Y3M20DT20H39M58.949S]
     ]
@@ -164,9 +164,9 @@
   (
     LiteralExpr [STRING] [interval65]
     :
-    FunctionCall test.interval-start-from-datetime@2[
+    FunctionCall asterix.interval-start-from-datetime@2[
       LiteralExpr [NULL]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P439Y3M20DT20H39M58.949S]
       ]
     ]
@@ -174,8 +174,8 @@
   (
     LiteralExpr [STRING] [interval66]
     :
-    FunctionCall test.interval-start-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval-start-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-2043-11-19T15:32:39.293]
       ]
       LiteralExpr [NULL]
@@ -184,11 +184,11 @@
   (
     LiteralExpr [STRING] [interval71]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2012-10-21]
       ]
     ]
@@ -196,9 +196,9 @@
   (
     LiteralExpr [STRING] [interval72]
     :
-    FunctionCall test.interval@2[
+    FunctionCall asterix.interval@2[
       LiteralExpr [NULL]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2012-10-21]
       ]
     ]
@@ -206,8 +206,8 @@
   (
     LiteralExpr [STRING] [interval73]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
       LiteralExpr [NULL]
@@ -216,11 +216,11 @@
   (
     LiteralExpr [STRING] [interval74]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [03:04:05.678-11:00]
       ]
-      FunctionCall test.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [232425267+0200]
       ]
     ]
@@ -228,9 +228,9 @@
   (
     LiteralExpr [STRING] [interval75]
     :
-    FunctionCall test.interval@2[
+    FunctionCall asterix.interval@2[
       LiteralExpr [NULL]
-      FunctionCall test.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [232425267+0200]
       ]
     ]
@@ -238,8 +238,8 @@
   (
     LiteralExpr [STRING] [interval76]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [03:04:05.678-11:00]
       ]
       LiteralExpr [NULL]
@@ -248,11 +248,11 @@
   (
     LiteralExpr [STRING] [interval77]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19991112T124935948-0700]
       ]
     ]
@@ -260,9 +260,9 @@
   (
     LiteralExpr [STRING] [interval78]
     :
-    FunctionCall test.interval@2[
+    FunctionCall asterix.interval@2[
       LiteralExpr [NULL]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19991112T124935948-0700]
       ]
     ]
@@ -270,8 +270,8 @@
   (
     LiteralExpr [STRING] [interval79]
     :
-    FunctionCall test.interval@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1987-11-19T02:43:57.938+08:00]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/line_01/line_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/line_01/line_01.3.ast
index a9bcd9f..4ac56e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/line_01/line_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/line_01/line_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [line1]
     :
-    FunctionCall test.line@1[
+    FunctionCall asterix.line@1[
       LiteralExpr [STRING] [10.1234,11.1e-1 +10.2E-2,-11.22]
     ]
   )
   (
     LiteralExpr [STRING] [line2]
     :
-    FunctionCall test.line@1[
+    FunctionCall asterix.line@1[
       LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2,-01.02]
     ]
   )
   (
     LiteralExpr [STRING] [line3]
     :
-    FunctionCall test.line@1[
-      FunctionCall test.line@1[
+    FunctionCall asterix.line@1[
+      FunctionCall asterix.line@1[
         LiteralExpr [STRING] [0.1234,-1.00e-10 +10.5E-2,-01.02]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/point_01/point_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/point_01/point_01.3.ast
index cf0faa2..ae93fc2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/point_01/point_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/point_01/point_01.3.ast
@@ -4,36 +4,36 @@
   (
     LiteralExpr [STRING] [point1]
     :
-    FunctionCall test.point@1[
+    FunctionCall asterix.point@1[
       LiteralExpr [STRING] [80.10d, -10E5]
     ]
   )
   (
     LiteralExpr [STRING] [point3d1]
     :
-    FunctionCall test.point3d@1[
+    FunctionCall asterix.point3d@1[
       LiteralExpr [STRING] [5e2, -10E+5, +10.5e-10d]
     ]
   )
   (
     LiteralExpr [STRING] [point2]
     :
-    FunctionCall test.point@1[
+    FunctionCall asterix.point@1[
       LiteralExpr [STRING] [5.10E-10d, -10E5]
     ]
   )
   (
     LiteralExpr [STRING] [point3d2]
     :
-    FunctionCall test.point3d@1[
+    FunctionCall asterix.point3d@1[
       LiteralExpr [STRING] [0.5e+2d, -10.0E+5d, +10.05e-10]
     ]
   )
   (
     LiteralExpr [STRING] [point3]
     :
-    FunctionCall test.point@1[
-      FunctionCall test.point@1[
+    FunctionCall asterix.point@1[
+      FunctionCall asterix.point@1[
         LiteralExpr [STRING] [5.10E-10d, -10E5]
       ]
     ]
@@ -41,8 +41,8 @@
   (
     LiteralExpr [STRING] [point3d3]
     :
-    FunctionCall test.point3d@1[
-      FunctionCall test.point3d@1[
+    FunctionCall asterix.point3d@1[
+      FunctionCall asterix.point3d@1[
         LiteralExpr [STRING] [0.5e+2d, -10.0E+5d, +10.05e-10]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/polygon_01/polygon_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/polygon_01/polygon_01.3.ast
index ece41d9..22456e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/polygon_01/polygon_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/polygon_01/polygon_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [polygon1]
     :
-    FunctionCall test.polygon@1[
+    FunctionCall asterix.polygon@1[
       LiteralExpr [STRING] [-1.2,+1.3e2 -2.14E+5,2.15 -3.5e+2,03.6 -4.6E-3,+4.81]
     ]
   )
   (
     LiteralExpr [STRING] [polygon2]
     :
-    FunctionCall test.polygon@1[
+    FunctionCall asterix.polygon@1[
       LiteralExpr [STRING] [-1.0,+10.5e2 -02.15E+50,2.5 -1.0,+3.3e3 -2.50E+05,20.15 +3.5e+2,03.6 -4.60E-3,+4.75 -2,+1.0e2 -2.00E+5,20.10 30.5,03.25 -4.33E-3,+4.75]
     ]
   )
   (
     LiteralExpr [STRING] [polygon3]
     :
-    FunctionCall test.polygon@1[
-      FunctionCall test.polygon@1[
+    FunctionCall asterix.polygon@1[
+      FunctionCall asterix.polygon@1[
         LiteralExpr [STRING] [-1.2,+1.3e2 -2.14E+5,2.15 -3.5e+2,03.6 -4.6E-3,+4.81]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-01/primitive-01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-01/primitive-01.3.ast
index db232e1..34bca75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-01/primitive-01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-01/primitive-01.3.ast
@@ -3,35 +3,35 @@
   (
     LiteralExpr [STRING] [$a]
     :
-    FunctionCall null.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [-127]
     ]
   )
   (
     LiteralExpr [STRING] [$b]
     :
-    FunctionCall null.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [127]
     ]
   )
   (
     LiteralExpr [STRING] [$c]
     :
-    FunctionCall null.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [0]
     ]
   )
   (
     LiteralExpr [STRING] [$d]
     :
-    FunctionCall null.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [1]
     ]
   )
   (
     LiteralExpr [STRING] [$e]
     :
-    FunctionCall null.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [-1]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-02/primitive-02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-02/primitive-02.3.ast
index 24e3507..5a662a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-02/primitive-02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-02/primitive-02.3.ast
@@ -3,49 +3,49 @@
   (
     LiteralExpr [STRING] [$a]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [-32767]
     ]
   )
   (
     LiteralExpr [STRING] [$b]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [32767]
     ]
   )
   (
     LiteralExpr [STRING] [$c]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [0]
     ]
   )
   (
     LiteralExpr [STRING] [$d]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [1]
     ]
   )
   (
     LiteralExpr [STRING] [$e]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [-1]
     ]
   )
   (
     LiteralExpr [STRING] [$f]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [16383]
     ]
   )
   (
     LiteralExpr [STRING] [$g]
     :
-    FunctionCall null.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [-16383]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-03/primitive-03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-03/primitive-03.3.ast
index c46f250..b07b99a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-03/primitive-03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-03/primitive-03.3.ast
@@ -3,49 +3,49 @@
   (
     LiteralExpr [STRING] [$a]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [-2147483647]
     ]
   )
   (
     LiteralExpr [STRING] [$b]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [2147483647]
     ]
   )
   (
     LiteralExpr [STRING] [$c]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [0]
     ]
   )
   (
     LiteralExpr [STRING] [$d]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [1]
     ]
   )
   (
     LiteralExpr [STRING] [$e]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [-1]
     ]
   )
   (
     LiteralExpr [STRING] [$f]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [1073741828]
     ]
   )
   (
     LiteralExpr [STRING] [$g]
     :
-    FunctionCall null.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [-1073741828]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-04/primitive-04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-04/primitive-04.3.ast
index e2136d4..0cae729 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-04/primitive-04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/primitive-04/primitive-04.3.ast
@@ -3,49 +3,49 @@
   (
     LiteralExpr [STRING] [$a]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [9222872036854775809]
     ]
   )
   (
     LiteralExpr [STRING] [$b]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [-9222872036854775809]
     ]
   )
   (
     LiteralExpr [STRING] [$c]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [0]
     ]
   )
   (
     LiteralExpr [STRING] [$d]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [1]
     ]
   )
   (
     LiteralExpr [STRING] [$e]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [-1]
     ]
   )
   (
     LiteralExpr [STRING] [$f]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [4611436018427387904]
     ]
   )
   (
     LiteralExpr [STRING] [$g]
     :
-    FunctionCall null.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [-4611436018427387904]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/rectangle_01/rectangle_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/rectangle_01/rectangle_01.3.ast
index 9632ac0..55c1122 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/rectangle_01/rectangle_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/rectangle_01/rectangle_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [rectangle1]
     :
-    FunctionCall test.rectangle@1[
+    FunctionCall asterix.rectangle@1[
       LiteralExpr [STRING] [5.1,11.8 87.6,15.6548]
     ]
   )
   (
     LiteralExpr [STRING] [rectangle2]
     :
-    FunctionCall test.rectangle@1[
+    FunctionCall asterix.rectangle@1[
       LiteralExpr [STRING] [0.1234,-1.00e-10 5.5487,0.48765]
     ]
   )
   (
     LiteralExpr [STRING] [rectangle3]
     :
-    FunctionCall test.rectangle@1[
-      FunctionCall test.rectangle@1[
+    FunctionCall asterix.rectangle@1[
+      FunctionCall asterix.rectangle@1[
         LiteralExpr [STRING] [5.1,11.8 87.6,15.6548]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/string_01/string_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/string_01/string_01.3.ast
index 5d4de90..2696db5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/string_01/string_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/string_01/string_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [string1]
     :
-    FunctionCall test.string@1[
+    FunctionCall asterix.string@1[
       LiteralExpr [STRING] [true]
     ]
   )
   (
     LiteralExpr [STRING] [string2]
     :
-    FunctionCall test.string@1[
+    FunctionCall asterix.string@1[
       LiteralExpr [STRING] [false"]
     ]
   )
   (
     LiteralExpr [STRING] [string3]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [8]
       ]
     ]
@@ -27,8 +27,8 @@
   (
     LiteralExpr [STRING] [string4]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [16]
       ]
     ]
@@ -36,8 +36,8 @@
   (
     LiteralExpr [STRING] [string5]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [32]
       ]
     ]
@@ -45,8 +45,8 @@
   (
     LiteralExpr [STRING] [string6]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [64]
       ]
     ]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [string7]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [1.25]
       ]
     ]
@@ -63,8 +63,8 @@
   (
     LiteralExpr [STRING] [string8]
     :
-    FunctionCall test.string@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.string@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2.5]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/time_01/time_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/time_01/time_01.3.ast
index 6be78b1..6c688cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/time_01/time_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/time_01/time_01.3.ast
@@ -4,85 +4,85 @@
   (
     LiteralExpr [STRING] [time1]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [10:50:56.200+05:00]
     ]
   )
   (
     LiteralExpr [STRING] [time2]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [10:50:56.200-10:15]
     ]
   )
   (
     LiteralExpr [STRING] [time3]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [10:50:56]
     ]
   )
   (
     LiteralExpr [STRING] [time4]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [10:50:56.200Z]
     ]
   )
   (
     LiteralExpr [STRING] [time5]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [23:59:59.999-13:30]
     ]
   )
   (
     LiteralExpr [STRING] [time6]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [00:00:00.000+14:45]
     ]
   )
   (
     LiteralExpr [STRING] [time7]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12:59:00.019-01:00]
     ]
   )
   (
     LiteralExpr [STRING] [time8]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12:59:00.01-01:00]
     ]
   )
   (
     LiteralExpr [STRING] [time9]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12:59:00.019-01:00]
     ]
   )
   (
     LiteralExpr [STRING] [time10]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12590001-0100]
     ]
   )
   (
     LiteralExpr [STRING] [time11]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [125900019+0100]
     ]
   )
   (
     LiteralExpr [STRING] [time12]
     :
-    FunctionCall test.time@1[
-      FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [125900019+0100]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/uuid_01/uuid_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/uuid_01/uuid_01.3.ast
index 9b2f4e0..addc784 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/uuid_01/uuid_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/constructor/uuid_01/uuid_01.3.ast
@@ -4,22 +4,22 @@
   (
     LiteralExpr [STRING] [uuid1]
     :
-    FunctionCall test.uuid@1[
+    FunctionCall asterix.uuid@1[
       LiteralExpr [STRING] [02a199ca-bf58-412e-bd9f-60a0c975a8ac]
     ]
   )
   (
     LiteralExpr [STRING] [uuid2]
     :
-    FunctionCall test.uuid@1[
+    FunctionCall asterix.uuid@1[
       LiteralExpr [STRING] [8cea25ab-55f8-467e-929d-94888f754832]
     ]
   )
   (
     LiteralExpr [STRING] [uuid3]
     :
-    FunctionCall test.uuid@1[
-      FunctionCall test.uuid@1[
+    FunctionCall asterix.uuid@1[
+      FunctionCall asterix.uuid@1[
         LiteralExpr [STRING] [8cea25ab-55f8-467e-929d-94888f754832]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/csv/basic-types/basic-types.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/csv/basic-types/basic-types.2.ast
index ea4d950..0f6da51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/csv/basic-types/basic-types.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/csv/basic-types/basic-types.2.ast
@@ -11,7 +11,7 @@
   (
     LiteralExpr [STRING] [string]
     :
-    FunctionCall test.string@1[
+    FunctionCall asterix.string@1[
       LiteralExpr [STRING] [Nancy]
     ]
   )
@@ -23,7 +23,7 @@
   (
     LiteralExpr [STRING] [double]
     :
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [-2013.5938237483274]
     ]
   )
@@ -35,112 +35,112 @@
   (
     LiteralExpr [STRING] [int8]
     :
-    FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [125]
     ]
   )
   (
     LiteralExpr [STRING] [int16]
     :
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [32765]
     ]
   )
   (
     LiteralExpr [STRING] [int32]
     :
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [294967295]
     ]
   )
   (
     LiteralExpr [STRING] [int64]
     :
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [1700000000000000000]
     ]
   )
   (
     LiteralExpr [STRING] [date]
     :
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [-2011-01-27]
     ]
   )
   (
     LiteralExpr [STRING] [time]
     :
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12:20:30Z]
     ]
   )
   (
     LiteralExpr [STRING] [datetime]
     :
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-1951-12-27T12:20:30]
     ]
   )
   (
     LiteralExpr [STRING] [duration]
     :
-    FunctionCall test.duration@1[
+    FunctionCall asterix.duration@1[
       LiteralExpr [STRING] [P10Y11M12DT10H50M30S]
     ]
   )
   (
     LiteralExpr [STRING] [point]
     :
-    FunctionCall test.point@1[
+    FunctionCall asterix.point@1[
       LiteralExpr [STRING] [41.00,44.00]
     ]
   )
   (
     LiteralExpr [STRING] [point3d]
     :
-    FunctionCall test.point3d@1[
+    FunctionCall asterix.point3d@1[
       LiteralExpr [STRING] [44.00,13.00,41.00]
     ]
   )
   (
     LiteralExpr [STRING] [line]
     :
-    FunctionCall test.line@1[
+    FunctionCall asterix.line@1[
       LiteralExpr [STRING] [10.1,11.1 10.2,11.2]
     ]
   )
   (
     LiteralExpr [STRING] [rectangle]
     :
-    FunctionCall test.rectangle@1[
+    FunctionCall asterix.rectangle@1[
       LiteralExpr [STRING] [5.1,11.8 87.6,15.6548]
     ]
   )
   (
     LiteralExpr [STRING] [polygon]
     :
-    FunctionCall test.polygon@1[
+    FunctionCall asterix.polygon@1[
       LiteralExpr [STRING] [1.2,1.3 2.1,2.5 3.5,3.6 4.6,4.8]
     ]
   )
   (
     LiteralExpr [STRING] [circle]
     :
-    FunctionCall test.circle@1[
+    FunctionCall asterix.circle@1[
       LiteralExpr [STRING] [10.1,11.1 10.2]
     ]
   )
   (
     LiteralExpr [STRING] [binary]
     :
-    FunctionCall test.hex@1[
+    FunctionCall asterix.hex@1[
       LiteralExpr [STRING] [ABCDEF0123456789]
     ]
   )
   (
     LiteralExpr [STRING] [uuid]
     :
-    FunctionCall test.uuid@1[
+    FunctionCall asterix.uuid@1[
       LiteralExpr [STRING] [5c848e5c-6b6a-498f-8452-8847a2957421]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
index a32db1d..742435a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
@@ -92,7 +92,7 @@
       Field=cid
     ]
     >=
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [3]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
index ed79556..1c3212c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
@@ -113,7 +113,7 @@
       Field=cid
     ]
     >=
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [3]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
index 8c758d6..5196d91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
@@ -105,7 +105,7 @@
       Field=cid
     ]
     >=
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [3]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
index 9e739f4..69ad67d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
index 9e739f4..69ad67d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
index 9fbfba8..a224f37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
index 30d57a3..5ce110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
index 0efb991..7a2ea92 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
index 6ddcba2..57a17cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
index 0e4c541..21e29aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
index 1485b5e..3fc95da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
index ded6d72..6c1a91e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
index 3b02994..39fd3c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
index a9e83dd..f00a084 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
index 0e4c541..21e29aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
index 6ddcba2..57a17cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
index 0e4c541..21e29aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
index a9e83dd..f00a084 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
index 3b02994..39fd3c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
index a9e83dd..f00a084 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
index ded6d72..6c1a91e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
index 1485b5e..3fc95da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
index ded6d72..6c1a91e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
index 8e5ec0b..89ced26 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
index 6ddcba2..57a17cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
index 8e5ec0b..89ced26 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
index 2a11645..807fb94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
index 3b02994..39fd3c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
index 2a11645..807fb94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
index a3863e7..cf52de3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
index a3ab36b..85604e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
index a3863e7..cf52de3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 5d4c69d..8dfee3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -48,7 +48,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -73,7 +73,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -87,7 +87,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
index caf47d3..204a6a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -82,7 +82,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
index 2f985dc..0345c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
index e0501fd..a648bff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
@@ -15,7 +15,7 @@
       Field=send-time
     ]
     =
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2014-01-20T10:10:00]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
index 8bc514e..1b75ed4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
@@ -25,7 +25,7 @@
         Field=send-time
       ]
       >
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-08-20T10:10:00]
       ]
     ]
@@ -36,7 +36,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-11-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
index 8257da4..1823b12 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
@@ -10,7 +10,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$m ]
         Field=message
@@ -24,7 +24,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-12-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
index e60853f..75f6e3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
@@ -11,14 +11,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$m ]
             Field=message
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           LiteralExpr [STRING] [love sprint at&t verizon]
         ]
       ]
@@ -32,7 +32,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-12-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
index 71e9ac4..8ae6bda1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
@@ -10,12 +10,12 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$m ]
         Field=sender-location
       ]
-      FunctionCall test.create-polygon@1[
+      FunctionCall asterix.create-polygon@1[
         OrderedListConstructor [
           LiteralExpr [DOUBLE] [40.0]
           LiteralExpr [DOUBLE] [79.87]
@@ -35,7 +35,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-11-20T10:10:00.000Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
index 18f08db..60fb2af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
@@ -15,7 +15,7 @@
       Field=send-time
     ]
     >
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2012-08-20T10:10:00]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
index 5b83358..7571b85 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
@@ -25,7 +25,7 @@
         Field=send-time
       ]
       >
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-08-20T10:10:00]
       ]
     ]
@@ -36,7 +36,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-11-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
index 8257da4..1823b12 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
@@ -10,7 +10,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$m ]
         Field=message
@@ -24,7 +24,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-12-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
index e60853f..75f6e3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
@@ -11,14 +11,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$m ]
             Field=message
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           LiteralExpr [STRING] [love sprint at&t verizon]
         ]
       ]
@@ -32,7 +32,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-12-20T10:10:00]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
index 71e9ac4..8ae6bda1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
@@ -10,12 +10,12 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$m ]
         Field=sender-location
       ]
-      FunctionCall test.create-polygon@1[
+      FunctionCall asterix.create-polygon@1[
         OrderedListConstructor [
           LiteralExpr [DOUBLE] [40.0]
           LiteralExpr [DOUBLE] [79.87]
@@ -35,7 +35,7 @@
         Field=send-time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-11-20T10:10:00.000Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
index af827a6..af46972 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
@@ -10,12 +10,12 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$m ]
         Field=sender-location
       ]
-      FunctionCall test.create-polygon@1[
+      FunctionCall asterix.create-polygon@1[
         OrderedListConstructor [
           LiteralExpr [DOUBLE] [40.0]
           LiteralExpr [DOUBLE] [79.87]
@@ -35,7 +35,7 @@
         Field=send-time
       ]
       >
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-11-20T10:10:00.000Z]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
index 2c74e63..a536843 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
@@ -15,7 +15,7 @@
       Field=send-time
     ]
     >
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2012-08-20T10:10:00]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
index 79623e5..c412e91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
@@ -72,7 +72,7 @@
 Groupby
   Variable [ Name=$fus ]
   :=
-  FunctionCall test.get-year@1[
+  FunctionCall asterix.get-year@1[
     FieldAccessor [
       Variable [ Name=$i ]
       Field=user-since
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
index 41a157e..c184468 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/query-issue550/query-issue550.3.ast
@@ -16,7 +16,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:00:00]
         ]
       )
@@ -40,7 +40,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:01:00]
         ]
       )
@@ -64,7 +64,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:02:00]
         ]
       )
@@ -88,7 +88,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:03:00]
         ]
       )
@@ -112,7 +112,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:04:00]
         ]
       )
@@ -136,7 +136,7 @@
       (
         LiteralExpr [STRING] [t]
         :
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-01-01T01:05:00]
         ]
       )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
index 6a37de6..f29f0ee 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
@@ -9,7 +9,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
index 95fc8fb..5bd5b5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
@@ -9,7 +9,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
index 95fc8fb..5bd5b5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
@@ -9,7 +9,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
index 934a36e..7e77424 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
@@ -9,7 +9,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
index 63c83d4..6c2bfbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
@@ -25,12 +25,12 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+    FunctionCall asterix.prefix-len-jaccard@2[
       FunctionCall asterix.dataset@1[
         LiteralExpr [STRING] [fuzzyjoin.lenDBLP]
       ]
@@ -47,7 +47,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -55,7 +55,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -76,7 +76,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
index a3f4e26..a4fa5aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
@@ -25,13 +25,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,7 +49,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -57,7 +57,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
index 9a6bf41..1984c2c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
@@ -29,7 +29,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -46,7 +46,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
index 464b8aa..07c041b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
@@ -29,7 +29,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -46,7 +46,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
index 1e7cafa..95e5d58 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
@@ -32,7 +32,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -49,7 +49,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
index 1689261..4fe1dc4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
@@ -28,7 +28,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -52,7 +52,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
index a2babd9..7b3c9be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
@@ -33,7 +33,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -41,7 +41,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -62,7 +62,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
index a2babd9..7b3c9be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
@@ -33,7 +33,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -41,7 +41,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -62,7 +62,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
index a2babd9..7b3c9be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
@@ -33,7 +33,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -41,7 +41,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -62,7 +62,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
index a2babd9..7b3c9be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
@@ -33,7 +33,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -41,7 +41,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -62,7 +62,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
index 6304774..0a6b044 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
@@ -33,7 +33,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -41,7 +41,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -62,7 +62,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
index 959f69a..5601840 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
@@ -51,12 +51,12 @@
       ]
       AS Variable [ Name=$paperLeft ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensLeft]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenLeft]
           ]
@@ -70,12 +70,12 @@
       ]
       AS Variable [ Name=$paperRight ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensRight]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenRight]
           ]
@@ -86,8 +86,8 @@
     ]
     Let Variable [ Name=$lenLeft ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperLeft ]
             Field=title
@@ -100,7 +100,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperLeft ]
               Field=title
@@ -117,7 +117,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -171,8 +171,8 @@
       )
     Let Variable [ Name=$lenRight ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperRight ]
             Field=title
@@ -185,7 +185,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperRight ]
               Field=title
@@ -202,7 +202,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -256,7 +256,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenLeft ]
         Variable [ Name=$tokensLeft ]
         Variable [ Name=$lenRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
index 959f69a..5601840 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
@@ -51,12 +51,12 @@
       ]
       AS Variable [ Name=$paperLeft ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensLeft]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenLeft]
           ]
@@ -70,12 +70,12 @@
       ]
       AS Variable [ Name=$paperRight ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensRight]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenRight]
           ]
@@ -86,8 +86,8 @@
     ]
     Let Variable [ Name=$lenLeft ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperLeft ]
             Field=title
@@ -100,7 +100,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperLeft ]
               Field=title
@@ -117,7 +117,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -171,8 +171,8 @@
       )
     Let Variable [ Name=$lenRight ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperRight ]
             Field=title
@@ -185,7 +185,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperRight ]
               Field=title
@@ -202,7 +202,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -256,7 +256,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenLeft ]
         Variable [ Name=$tokensLeft ]
         Variable [ Name=$lenRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
index ba90fec..2ff3d69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
@@ -61,12 +61,12 @@
       ]
       AS Variable [ Name=$paperLeft ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensLeft]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenLeft]
           ]
@@ -80,12 +80,12 @@
       ]
       AS Variable [ Name=$paperRight ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensRight]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
+        FunctionCall asterix.prefix-len-jaccard@2[
           FunctionCall asterix.dataset@1[
             LiteralExpr [STRING] [fuzzyjoin.lenRight]
           ]
@@ -96,8 +96,8 @@
     ]
     Let Variable [ Name=$lenLeft ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperLeft ]
             Field=title
@@ -110,7 +110,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperLeft ]
               Field=title
@@ -127,7 +127,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -181,8 +181,8 @@
       )
     Let Variable [ Name=$lenRight ]
       :=
-      FunctionCall fuzzyjoin.len@1[
-        FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.len@1[
+        FunctionCall asterix.counthashed-word-tokens@1[
           FieldAccessor [
             Variable [ Name=$paperRight ]
             Field=title
@@ -195,7 +195,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperRight ]
               Field=title
@@ -212,7 +212,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -266,7 +266,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenLeft ]
         Variable [ Name=$tokensLeft ]
         Variable [ Name=$lenRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
index 4c1fd0e..35c13be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
@@ -28,14 +28,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$dblp ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$dblp2 ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
index 201405b..6b0e231 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -71,7 +71,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -88,7 +88,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -146,7 +146,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -163,7 +163,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -217,9 +217,9 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -227,8 +227,8 @@
       ]
     ]
     Variable [ Name=$tokensDBLP ]
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
index bc3e7bd..4e7e104 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -71,7 +71,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -88,7 +88,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -153,7 +153,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -170,7 +170,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -231,9 +231,9 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -241,8 +241,8 @@
       ]
     ]
     Variable [ Name=$tokensDBLP ]
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
index 9820085..f6ac967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -77,7 +77,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -94,7 +94,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -165,7 +165,7 @@
     SELECT ELEMENT [
     Variable [ Name=$i ]
     ]
-    FROM [      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FROM [      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -182,7 +182,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -243,9 +243,9 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -253,8 +253,8 @@
       ]
     ]
     Variable [ Name=$tokensDBLP ]
-    FunctionCall fuzzyjoin.len@1[
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+    FunctionCall asterix.len@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
index b426df7..be9f563 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -97,7 +97,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -164,7 +164,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -188,7 +188,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -249,12 +249,12 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-    FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
+    FunctionCall asterix.len@1[
       Variable [ Name=$tokensUnrankedDBLP ]
     ]
     Variable [ Name=$tokensDBLP ]
-    FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.len@1[
       Variable [ Name=$tokensUnrankedCSX ]
     ]
     Variable [ Name=$tokensCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
index 2fcb5cd..1cd1fb8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -81,7 +81,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -102,7 +102,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -169,7 +169,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -177,7 +177,7 @@
   ]
 Let Variable [ Name=$lenCSX ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedCSX ]
   ]
 Let Variable [ Name=$tokensCSX ]
@@ -198,7 +198,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -259,7 +259,7 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     Variable [ Name=$lenDBLP ]
     Variable [ Name=$tokensDBLP ]
     Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
index 2fcb5cd..1cd1fb8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -81,7 +81,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -102,7 +102,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -169,7 +169,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -177,7 +177,7 @@
   ]
 Let Variable [ Name=$lenCSX ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedCSX ]
   ]
 Let Variable [ Name=$tokensCSX ]
@@ -198,7 +198,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -259,7 +259,7 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     Variable [ Name=$lenDBLP ]
     Variable [ Name=$tokensDBLP ]
     Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
index 8aa7d18..bfd2029 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -81,7 +81,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -102,7 +102,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -169,7 +169,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -177,7 +177,7 @@
   ]
 Let Variable [ Name=$lenCSX ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedCSX ]
   ]
 Let Variable [ Name=$tokensCSX ]
@@ -198,7 +198,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -259,7 +259,7 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     Variable [ Name=$lenDBLP ]
     Variable [ Name=$tokensDBLP ]
     Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
index 2fcb5cd..1cd1fb8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -81,7 +81,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -102,7 +102,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -169,7 +169,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -177,7 +177,7 @@
   ]
 Let Variable [ Name=$lenCSX ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedCSX ]
   ]
 Let Variable [ Name=$tokensCSX ]
@@ -198,7 +198,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -259,7 +259,7 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     Variable [ Name=$lenDBLP ]
     Variable [ Name=$tokensDBLP ]
     Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
index 8aa7d18..bfd2029 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
@@ -28,13 +28,13 @@
   ]
   AS Variable [ Name=$paperDBLP ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
@@ -49,13 +49,13 @@
   ]
   AS Variable [ Name=$paperCSX ]
 ,
-  FunctionCall fuzzyjoin.subset-collection@3[
+  FunctionCall asterix.subset-collection@3[
     FunctionCall asterix.dataset@1[
       LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
     ]
     LiteralExpr [LONG] [0]
-    FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-      FunctionCall fuzzyjoin.len@1[
+    FunctionCall asterix.prefix-len-jaccard@2[
+      FunctionCall asterix.len@1[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
@@ -73,7 +73,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedDBLP ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperDBLP ]
       Field=title
@@ -81,7 +81,7 @@
   ]
 Let Variable [ Name=$lenDBLP ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedDBLP ]
   ]
 Let Variable [ Name=$tokensDBLP ]
@@ -102,7 +102,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -169,7 +169,7 @@
   ]
 Let Variable [ Name=$tokensUnrankedCSX ]
   :=
-  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paperCSX ]
       Field=title
@@ -177,7 +177,7 @@
   ]
 Let Variable [ Name=$lenCSX ]
   :=
-  FunctionCall fuzzyjoin.len@1[
+  FunctionCall asterix.len@1[
     Variable [ Name=$tokensUnrankedCSX ]
   ]
 Let Variable [ Name=$tokensCSX ]
@@ -198,7 +198,7 @@
           ]
           AS Variable [ Name=$paper ]
 ,
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paper ]
               Field=title
@@ -259,7 +259,7 @@
   )
 Let Variable [ Name=$sim ]
   :=
-  FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     Variable [ Name=$lenDBLP ]
     Variable [ Name=$tokensDBLP ]
     Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
index 38fff8c..fddeacb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -94,7 +94,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -111,7 +111,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -169,7 +169,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
@@ -186,7 +186,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -240,9 +240,9 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -250,8 +250,8 @@
           ]
         ]
         Variable [ Name=$tokensDBLP ]
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
index 49eedfd..c53c4fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -94,7 +94,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -111,7 +111,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -176,7 +176,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
@@ -193,7 +193,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -254,9 +254,9 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -264,8 +264,8 @@
           ]
         ]
         Variable [ Name=$tokensDBLP ]
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
index 22069a1..2aeeb40 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -100,7 +100,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -117,7 +117,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -188,7 +188,7 @@
         SELECT ELEMENT [
         Variable [ Name=$i ]
         ]
-        FROM [          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FROM [          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
@@ -205,7 +205,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -266,9 +266,9 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -276,8 +276,8 @@
           ]
         ]
         Variable [ Name=$tokensDBLP ]
-        FunctionCall fuzzyjoin.len@1[
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+        FunctionCall asterix.len@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
index 7d61632..2e6fc16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -120,7 +120,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -187,7 +187,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -211,7 +211,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -272,12 +272,12 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
-        FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
+        FunctionCall asterix.len@1[
           Variable [ Name=$tokensUnrankedDBLP ]
         ]
         Variable [ Name=$tokensDBLP ]
-        FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.len@1[
           Variable [ Name=$tokensUnrankedCSX ]
         ]
         Variable [ Name=$tokensCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
index 99ef2b7..8e8f750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -104,7 +104,7 @@
       ]
     Let Variable [ Name=$lenDBLP ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedDBLP ]
       ]
     Let Variable [ Name=$tokensDBLP ]
@@ -125,7 +125,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -192,7 +192,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -200,7 +200,7 @@
       ]
     Let Variable [ Name=$lenCSX ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedCSX ]
       ]
     Let Variable [ Name=$tokensCSX ]
@@ -221,7 +221,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenDBLP ]
         Variable [ Name=$tokensDBLP ]
         Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
index 99ef2b7..8e8f750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -104,7 +104,7 @@
       ]
     Let Variable [ Name=$lenDBLP ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedDBLP ]
       ]
     Let Variable [ Name=$tokensDBLP ]
@@ -125,7 +125,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -192,7 +192,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -200,7 +200,7 @@
       ]
     Let Variable [ Name=$lenCSX ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedCSX ]
       ]
     Let Variable [ Name=$tokensCSX ]
@@ -221,7 +221,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenDBLP ]
         Variable [ Name=$tokensDBLP ]
         Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
index 99ef2b7..8e8f750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -104,7 +104,7 @@
       ]
     Let Variable [ Name=$lenDBLP ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedDBLP ]
       ]
     Let Variable [ Name=$tokensDBLP ]
@@ -125,7 +125,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -192,7 +192,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -200,7 +200,7 @@
       ]
     Let Variable [ Name=$lenCSX ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedCSX ]
       ]
     Let Variable [ Name=$tokensCSX ]
@@ -221,7 +221,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenDBLP ]
         Variable [ Name=$tokensDBLP ]
         Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
index 99399d76..1d7411d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -104,7 +104,7 @@
       ]
     Let Variable [ Name=$lenDBLP ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedDBLP ]
       ]
     Let Variable [ Name=$tokensDBLP ]
@@ -125,7 +125,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -192,7 +192,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -200,7 +200,7 @@
       ]
     Let Variable [ Name=$lenCSX ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedCSX ]
       ]
     Let Variable [ Name=$tokensCSX ]
@@ -221,7 +221,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenDBLP ]
         Variable [ Name=$tokensDBLP ]
         Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
index 606edd0..ce31b00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
@@ -98,13 +98,13 @@
           ]
           AS Variable [ Name=$paperDBLP ]
 ,
-          FunctionCall fuzzyjoin.subset-collection@3[
+          FunctionCall asterix.subset-collection@3[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
             LiteralExpr [LONG] [0]
-            FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-              FunctionCall fuzzyjoin.len@1[
+            FunctionCall asterix.prefix-len-jaccard@2[
+              FunctionCall asterix.len@1[
                 FunctionCall asterix.dataset@1[
                   LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
                 ]
@@ -119,13 +119,13 @@
           ]
           AS Variable [ Name=$paperCSX ]
 ,
-          FunctionCall fuzzyjoin.subset-collection@3[
+          FunctionCall asterix.subset-collection@3[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
             LiteralExpr [LONG] [0]
-            FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-              FunctionCall fuzzyjoin.len@1[
+            FunctionCall asterix.prefix-len-jaccard@2[
+              FunctionCall asterix.len@1[
                 FunctionCall asterix.dataset@1[
                   LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
                 ]
@@ -143,7 +143,7 @@
           ]
         Let Variable [ Name=$tokensUnrankedDBLP ]
           :=
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -151,7 +151,7 @@
           ]
         Let Variable [ Name=$lenDBLP ]
           :=
-          FunctionCall fuzzyjoin.len@1[
+          FunctionCall asterix.len@1[
             Variable [ Name=$tokensUnrankedDBLP ]
           ]
         Let Variable [ Name=$tokensDBLP ]
@@ -172,7 +172,7 @@
                   ]
                   AS Variable [ Name=$paper ]
 ,
-                  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+                  FunctionCall asterix.counthashed-word-tokens@1[
                     FieldAccessor [
                       Variable [ Name=$paper ]
                       Field=title
@@ -239,7 +239,7 @@
           ]
         Let Variable [ Name=$tokensUnrankedCSX ]
           :=
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
@@ -247,7 +247,7 @@
           ]
         Let Variable [ Name=$lenCSX ]
           :=
-          FunctionCall fuzzyjoin.len@1[
+          FunctionCall asterix.len@1[
             Variable [ Name=$tokensUnrankedCSX ]
           ]
         Let Variable [ Name=$tokensCSX ]
@@ -268,7 +268,7 @@
                   ]
                   AS Variable [ Name=$paper ]
 ,
-                  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+                  FunctionCall asterix.counthashed-word-tokens@1[
                     FieldAccessor [
                       Variable [ Name=$paper ]
                       Field=title
@@ -329,7 +329,7 @@
           )
         Let Variable [ Name=$sim ]
           :=
-          FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+          FunctionCall asterix.similarity-jaccard-prefix@6[
             Variable [ Name=$lenDBLP ]
             Variable [ Name=$tokensDBLP ]
             Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
index 87e475a..7632755 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
@@ -98,13 +98,13 @@
           ]
           AS Variable [ Name=$paperDBLP ]
 ,
-          FunctionCall fuzzyjoin.subset-collection@3[
+          FunctionCall asterix.subset-collection@3[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
             LiteralExpr [LONG] [0]
-            FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-              FunctionCall fuzzyjoin.len@1[
+            FunctionCall asterix.prefix-len-jaccard@2[
+              FunctionCall asterix.len@1[
                 FunctionCall asterix.dataset@1[
                   LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
                 ]
@@ -119,13 +119,13 @@
           ]
           AS Variable [ Name=$paperCSX ]
 ,
-          FunctionCall fuzzyjoin.subset-collection@3[
+          FunctionCall asterix.subset-collection@3[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
             LiteralExpr [LONG] [0]
-            FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-              FunctionCall fuzzyjoin.len@1[
+            FunctionCall asterix.prefix-len-jaccard@2[
+              FunctionCall asterix.len@1[
                 FunctionCall asterix.dataset@1[
                   LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
                 ]
@@ -143,7 +143,7 @@
           ]
         Let Variable [ Name=$tokensUnrankedDBLP ]
           :=
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperDBLP ]
               Field=title
@@ -151,7 +151,7 @@
           ]
         Let Variable [ Name=$lenDBLP ]
           :=
-          FunctionCall fuzzyjoin.len@1[
+          FunctionCall asterix.len@1[
             Variable [ Name=$tokensUnrankedDBLP ]
           ]
         Let Variable [ Name=$tokensDBLP ]
@@ -172,7 +172,7 @@
                   ]
                   AS Variable [ Name=$paper ]
 ,
-                  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+                  FunctionCall asterix.counthashed-word-tokens@1[
                     FieldAccessor [
                       Variable [ Name=$paper ]
                       Field=title
@@ -239,7 +239,7 @@
           ]
         Let Variable [ Name=$tokensUnrankedCSX ]
           :=
-          FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+          FunctionCall asterix.counthashed-word-tokens@1[
             FieldAccessor [
               Variable [ Name=$paperCSX ]
               Field=title
@@ -247,7 +247,7 @@
           ]
         Let Variable [ Name=$lenCSX ]
           :=
-          FunctionCall fuzzyjoin.len@1[
+          FunctionCall asterix.len@1[
             Variable [ Name=$tokensUnrankedCSX ]
           ]
         Let Variable [ Name=$tokensCSX ]
@@ -268,7 +268,7 @@
                   ]
                   AS Variable [ Name=$paper ]
 ,
-                  FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+                  FunctionCall asterix.counthashed-word-tokens@1[
                     FieldAccessor [
                       Variable [ Name=$paper ]
                       Field=title
@@ -329,7 +329,7 @@
           )
         Let Variable [ Name=$sim ]
           :=
-          FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+          FunctionCall asterix.similarity-jaccard-prefix@6[
             Variable [ Name=$lenDBLP ]
             Variable [ Name=$tokensDBLP ]
             Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
index 99399d76..1d7411d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
@@ -51,13 +51,13 @@
       ]
       AS Variable [ Name=$paperDBLP ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensDBLP]
             ]
@@ -72,13 +72,13 @@
       ]
       AS Variable [ Name=$paperCSX ]
 ,
-      FunctionCall fuzzyjoin.subset-collection@3[
+      FunctionCall asterix.subset-collection@3[
         FunctionCall asterix.dataset@1[
           LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
         ]
         LiteralExpr [LONG] [0]
-        FunctionCall fuzzyjoin.prefix-len-jaccard@2[
-          FunctionCall fuzzyjoin.len@1[
+        FunctionCall asterix.prefix-len-jaccard@2[
+          FunctionCall asterix.len@1[
             FunctionCall asterix.dataset@1[
               LiteralExpr [STRING] [fuzzyjoin.tokensCSX]
             ]
@@ -96,7 +96,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedDBLP ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperDBLP ]
           Field=title
@@ -104,7 +104,7 @@
       ]
     Let Variable [ Name=$lenDBLP ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedDBLP ]
       ]
     Let Variable [ Name=$tokensDBLP ]
@@ -125,7 +125,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -192,7 +192,7 @@
       ]
     Let Variable [ Name=$tokensUnrankedCSX ]
       :=
-      FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+      FunctionCall asterix.counthashed-word-tokens@1[
         FieldAccessor [
           Variable [ Name=$paperCSX ]
           Field=title
@@ -200,7 +200,7 @@
       ]
     Let Variable [ Name=$lenCSX ]
       :=
-      FunctionCall fuzzyjoin.len@1[
+      FunctionCall asterix.len@1[
         Variable [ Name=$tokensUnrankedCSX ]
       ]
     Let Variable [ Name=$tokensCSX ]
@@ -221,7 +221,7 @@
               ]
               AS Variable [ Name=$paper ]
 ,
-              FunctionCall fuzzyjoin.counthashed-word-tokens@1[
+              FunctionCall asterix.counthashed-word-tokens@1[
                 FieldAccessor [
                   Variable [ Name=$paper ]
                   Field=title
@@ -282,7 +282,7 @@
       )
     Let Variable [ Name=$sim ]
       :=
-      FunctionCall fuzzyjoin.similarity-jaccard-prefix@6[
+      FunctionCall asterix.similarity-jaccard-prefix@6[
         Variable [ Name=$lenDBLP ]
         Variable [ Name=$tokensDBLP ]
         Variable [ Name=$lenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
index 6d23e45..cc6ef31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
@@ -27,14 +27,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$j ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
index a796c3e..6ccd28b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
@@ -27,14 +27,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$dblp ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$csx ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
index 8091791..6f0c47b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
@@ -27,14 +27,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$csx ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall fuzzyjoin.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$dblp ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
index c7ed736..8a02dc2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
@@ -38,14 +38,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$dblp ]
           Field=title
         ]
       ]
       ~=
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$csx ]
           Field=title
@@ -54,14 +54,14 @@
     ]
     and
     OperatorExpr [
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$csx ]
           Field=authors
         ]
       ]
       ~=
-      FunctionCall fuzzyjoin.word-tokens@1[
+      FunctionCall asterix.word-tokens@1[
         FieldAccessor [
           Variable [ Name=$dblp2 ]
           Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.10.ast
index 9c6df5d..e560710 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.10.ast
@@ -1,93 +1,248 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=twenty
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=twenty
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      DECOR
+      Variable [ Name=$four ]
+      :=
+      LiteralExpr [NULL]
+      Variable [ Name=$ten ]
+      :=
+      LiteralExpr [NULL]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@3[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [3]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [5]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#7 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#7 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [6]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.11.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.11.ast
index 462e1e4..c4060e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.11.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.11.ast
@@ -1,85 +1,194 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=twenty
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=twenty
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      Variable [ Name=$ten ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=ten
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@3[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [7]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.12.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.12.ast
index f89980c..b419ea4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.12.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.12.ast
@@ -42,9 +42,7 @@
 
 Let Variable [ Name=#2 ]
   :=
-  FunctionCall test.grouping@1[
-    Variable [ Name=$two ]
-  ]
+  LiteralExpr [LONG] [0]
 Orderby
   Variable [ Name=$two ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.13.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.13.ast
index 5fa0a46..674d94c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.13.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.13.ast
@@ -1,228 +1,787 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=$twenty ]
-twenty
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=$twenty ]
+    twenty
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=hundred
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=hundred
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      Variable [ Name=$ten ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=ten
+      ]
+      Variable [ Name=$twenty ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=twenty
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@4[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-    Variable [ Name=$twenty ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [2]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#7 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#7 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#8 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#8 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [4]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#9 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#9 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [5]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#10 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#10 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [6]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#11 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#11 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [7]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#12 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#12 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [12]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#13 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#13 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [13]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#14 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#14 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [14]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#15 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#15 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [15]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
-  Variable [ Name=$twenty ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=twenty
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.14.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.14.ast
index 5fa0a46..674d94c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.14.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.14.ast
@@ -1,228 +1,787 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=$twenty ]
-twenty
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=$twenty ]
+    twenty
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=hundred
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=hundred
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      Variable [ Name=$ten ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=ten
+      ]
+      Variable [ Name=$twenty ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=twenty
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@4[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-    Variable [ Name=$twenty ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [2]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#7 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#7 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#8 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#8 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [4]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#9 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#9 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [5]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#10 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#10 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [6]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#11 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#11 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [7]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#12 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#12 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [12]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#13 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#13 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [13]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#14 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#14 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [14]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#15 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#15 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [15]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
-  Variable [ Name=$twenty ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=twenty
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.15.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.15.ast
index 767e94f..80f30d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.15.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.15.ast
@@ -1,116 +1,454 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=$twenty ]
-twenty
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=$twenty ]
+    twenty
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=hundred
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=hundred
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$twenty ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=twenty
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      DECOR
+      Variable [ Name=$ten ]
+      :=
+      LiteralExpr [NULL]
+      Variable [ Name=$twenty ]
+      :=
+      LiteralExpr [NULL]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@4[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-    Variable [ Name=$twenty ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [3]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [7]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [15]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#7 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#7 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [12]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#8 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#8 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$ten ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=ten
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [13]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#9 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#9 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$twenty ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=twenty
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [14]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=$twenty ]
+      twenty
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#10 ]
+              Field=tenk
+            ]
+            Field=hundred
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#10 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$twenty ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [15]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
-  Variable [ Name=$twenty ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=twenty
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.5.ast
index f9f3410..d1a5570 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.5.ast
@@ -1,36 +1,74 @@
 DataverseUse test
 Query:
-SELECT [
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#2 ]
+]
+FROM [  (
+    SELECT [
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#3 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#3 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=ten
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-  )
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      GROUPING SET (
+      )
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
+    UNION
+      SELECT [
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#4 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#4 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+  )
+  AS Variable [ Name=#2 ]
+]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.7.ast
index b2898d1..4baddd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.7.ast
@@ -1,74 +1,171 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=ten
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@2[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.8.ast
index 11c6281..255b4cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.8.ast
@@ -1,82 +1,221 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=ten
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@2[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [2]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#7 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#7 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$two ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.9.ast
index 775f28e..6a5daae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-1/grouping-sets-1.9.ast
@@ -1,97 +1,198 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$two ]
-two
-Variable [ Name=$four ]
-four
-Variable [ Name=$ten ]
-ten
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$two ]
+    two
+    Variable [ Name=$four ]
+    four
+    Variable [ Name=$ten ]
+    ten
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=twenty
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=twenty
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-    Variable [ Name=$ten ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=ten
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$four ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$two ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$two ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$four ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      Variable [ Name=$ten ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=ten
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@3[
-    Variable [ Name=$two ]
-    Variable [ Name=$four ]
-    Variable [ Name=$ten ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        Variable [ Name=$four ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=four
+        ]
+        DECOR
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$two ]
+      two
+      Variable [ Name=$four ]
+      four
+      Variable [ Name=$ten ]
+      ten
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=twenty
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$two ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$four ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$ten ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$two ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=two
+  ]
   ASC
-  Variable [ Name=$four ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=four
+  ]
   ASC
-  Variable [ Name=$ten ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=ten
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.4.ast
index 04c8aec..30e5e96 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.4.ast
@@ -1,74 +1,171 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$v2 ]
-v2
-Variable [ Name=$v4 ]
-v4
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$v2 ]
+    v2
+    Variable [ Name=$v4 ]
+    v4
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=ten
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$v2 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$v4 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$v2 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$v2 ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$v4 ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@2[
-    Variable [ Name=$v2 ]
-    Variable [ Name=$v4 ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$v2 ]
+      v2
+      Variable [ Name=$v4 ]
+      v4
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$v2 ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$v4 ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$v2 ]
+      v2
+      Variable [ Name=$v4 ]
+      v4
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        GROUPING SET (
+        )
+        DECOR
+        Variable [ Name=$v2 ]
+        :=
+        LiteralExpr [NULL]
+        Variable [ Name=$v4 ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [3]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$v2 ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=v2
+  ]
   ASC
-  Variable [ Name=$v4 ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=v4
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.5.ast
index af33220..27364a3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/group-by/grouping-sets-2/grouping-sets-2.5.ast
@@ -1,80 +1,172 @@
 DataverseUse test
 Query:
-SELECT [
-Variable [ Name=$v2 ]
-v2
-Variable [ Name=$v4 ]
-v4
-Variable [ Name=#2 ]
-grp
-FunctionCall asterix.sql-sum@1[
-  (
-    SELECT ELEMENT [
-    FieldAccessor [
-      FieldAccessor [
-        Variable [ Name=#3 ]
-        Field=tenk
+SELECT ELEMENT [
+Variable [ Name=#3 ]
+]
+FROM [  (
+    SELECT [
+    Variable [ Name=$v2 ]
+    v2
+    Variable [ Name=$v4 ]
+    v4
+    Variable [ Name=#2 ]
+    grp
+    FunctionCall asterix.sql-sum@1[
+      (
+        SELECT ELEMENT [
+        FieldAccessor [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=tenk
+          ]
+          Field=ten
+        ]
+        ]
+        FROM [          Variable [ Name=#1 ]
+          AS Variable [ Name=#4 ]
+        ]
+      )
+    ]
+    agg_sum
+    ]
+    FROM [      FunctionCall asterix.dataset@1[
+        LiteralExpr [STRING] [test.tenk]
       ]
-      Field=ten
+      AS Variable [ Name=$tenk ]
     ]
-    ]
-    FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
-    ]
-  )
-]
-agg_sum
-]
-FROM [  FunctionCall asterix.dataset@1[
-    LiteralExpr [STRING] [test.tenk]
-  ]
-  AS Variable [ Name=$tenk ]
-]
-Groupby
-  GROUPING SET (
-    Variable [ Name=$v2 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-    Variable [ Name=$v4 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=four
-    ]
-  )
-  GROUPING SET (
-    Variable [ Name=$v2 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUPING SET (
-    Variable [ Name=$v2 ]
-    :=
-    FieldAccessor [
-      Variable [ Name=$tenk ]
-      Field=two
-    ]
-  ),
-  GROUP AS Variable [ Name=#1 ]
-  (
-    tenk:=Variable [ Name=$tenk ]
-  )
+    Groupby
+      Variable [ Name=$v2 ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=two
+      ]
+      Variable [ Name=$v4 ]
+      :=
+      FieldAccessor [
+        Variable [ Name=$tenk ]
+        Field=four
+      ]
+      GROUP AS Variable [ Name=#1 ]
+      (
+        tenk:=Variable [ Name=$tenk ]
+      )
 
-Let Variable [ Name=#2 ]
-  :=
-  FunctionCall test.grouping@2[
-    Variable [ Name=$v2 ]
-    Variable [ Name=$v4 ]
-  ]
+    Let Variable [ Name=#2 ]
+      :=
+      LiteralExpr [LONG] [0]
+    UNION
+      SELECT [
+      Variable [ Name=$v2 ]
+      v2
+      Variable [ Name=$v4 ]
+      v4
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#5 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#5 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$v2 ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$v4 ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+    UNION
+      SELECT [
+      Variable [ Name=$v2 ]
+      v2
+      Variable [ Name=$v4 ]
+      v4
+      Variable [ Name=#2 ]
+      grp
+      FunctionCall asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            FieldAccessor [
+              Variable [ Name=#6 ]
+              Field=tenk
+            ]
+            Field=ten
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#6 ]
+          ]
+        )
+      ]
+      agg_sum
+      ]
+      FROM [        FunctionCall asterix.dataset@1[
+          LiteralExpr [STRING] [test.tenk]
+        ]
+        AS Variable [ Name=$tenk ]
+      ]
+      Groupby
+        Variable [ Name=$v2 ]
+        :=
+        FieldAccessor [
+          Variable [ Name=$tenk ]
+          Field=two
+        ]
+        DECOR
+        Variable [ Name=$v4 ]
+        :=
+        LiteralExpr [NULL]
+        GROUP AS Variable [ Name=#1 ]
+        (
+          tenk:=Variable [ Name=$tenk ]
+        )
+
+      Let Variable [ Name=#2 ]
+        :=
+        LiteralExpr [LONG] [1]
+  )
+  AS Variable [ Name=#3 ]
+]
 Orderby
-  Variable [ Name=$v2 ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=v2
+  ]
   ASC
-  Variable [ Name=$v4 ]
+  FieldAccessor [
+    Variable [ Name=#3 ]
+    Field=v4
+  ]
   ASC
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
index 9a51c0b..fe0b49d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$line ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$line ]
       Field=content
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
index 9a51c0b..fe0b49d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$line ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$line ]
       Field=content
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
index 9a51c0b..fe0b49d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$line ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$line ]
       Field=content
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
index 9a51c0b..fe0b49d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$line ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$line ]
       Field=content
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 939c13a..676c6d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -48,7 +48,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index caf47d3..204a6a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -82,7 +82,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 63d8847..eab57b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -96,7 +96,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
index eab8c44..3e2036e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
@@ -55,7 +55,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.similarity-jaccard-check@3[
+        FunctionCall asterix.similarity-jaccard-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=referred-topics
@@ -108,7 +108,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index 1517a3a..86e3c17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -55,7 +55,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=message-text
@@ -108,7 +108,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 5d4c69d..8dfee3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -48,7 +48,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -73,7 +73,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -87,7 +87,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index e88a804..1563d4c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -49,7 +49,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               Variable [ Name=$t2 ]
               Field=sender-location
@@ -87,7 +87,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -101,7 +101,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index 0e4c541..21e29aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 0f93d91..6d19d11 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -27,7 +27,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-contains@3[
+    FunctionCall asterix.edit-distance-contains@3[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 7ba1ec6..4afcf42 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index 204b85c..6dd3c31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -25,7 +25,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index c50ce00..62aa015 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index 2cace6f..7792ca4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -11,8 +11,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -20,7 +20,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
index 71a47e3..64b1e69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
index 609dc25..3e66801 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
index de7e638..8d7dbde 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
index 4979e59..b970dce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       Variable [ Name=$c ]
       Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index 0e4c541..21e29aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index a9e83dd..f00a084 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -10,14 +10,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.5.ast
index ecfb9f3..ebd7f41 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.5.ast
@@ -28,9 +28,9 @@
       OperatorExpr [
         LiteralExpr [LONG] [100]
         +
-        FunctionCall test.to-bigint@1[
+        FunctionCall asterix.to-bigint@1[
           OperatorExpr [
-            FunctionCall test.random@0[
+            FunctionCall asterix.random@0[
             ]
             /
             LiteralExpr [LONG] [2]
@@ -48,9 +48,9 @@
       OperatorExpr [
         LiteralExpr [LONG] [5]
         +
-        FunctionCall test.to-bigint@1[
+        FunctionCall asterix.to-bigint@1[
           OperatorExpr [
-            FunctionCall test.random@0[
+            FunctionCall asterix.random@0[
             ]
             /
             LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.5.ast
index ecfb9f3..ebd7f41 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.5.ast
@@ -28,9 +28,9 @@
       OperatorExpr [
         LiteralExpr [LONG] [100]
         +
-        FunctionCall test.to-bigint@1[
+        FunctionCall asterix.to-bigint@1[
           OperatorExpr [
-            FunctionCall test.random@0[
+            FunctionCall asterix.random@0[
             ]
             /
             LiteralExpr [LONG] [2]
@@ -48,9 +48,9 @@
       OperatorExpr [
         LiteralExpr [LONG] [5]
         +
-        FunctionCall test.to-bigint@1[
+        FunctionCall asterix.to-bigint@1[
           OperatorExpr [
-            FunctionCall test.random@0[
+            FunctionCall asterix.random@0[
             ]
             /
             LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
index f411049..d16d9ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
@@ -18,13 +18,13 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [5.0]
         LiteralExpr [DOUBLE] [5.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
index 2f985dc..0345c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
index 2f985dc..0345c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 2f985dc..0345c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 13e4f9c..c358659 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -37,7 +37,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
index be5c8eb..dd3dd47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -33,7 +33,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index c72c206..2276491 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -38,8 +38,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -47,7 +47,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
index fbc8b28..c043116 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
@@ -34,8 +34,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -43,7 +43,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
index 39cc5a7..dc4bea5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
@@ -38,7 +38,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -51,7 +51,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -62,7 +62,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
index 5907460..aab46c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
@@ -34,7 +34,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -45,7 +45,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
@@ -56,7 +56,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
index 7a5e585..643c3aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
@@ -38,7 +38,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -69,7 +69,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -80,7 +80,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
index 7bbc28e..8f2b2db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
@@ -34,7 +34,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -61,7 +61,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -72,7 +72,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
index 7a5e585..643c3aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
@@ -38,7 +38,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -69,7 +69,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -80,7 +80,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
index 7bbc28e..8f2b2db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
@@ -34,7 +34,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -61,7 +61,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -72,7 +72,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
index 73e56d9..39d1e19 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -38,14 +38,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
index b0c74ec..2d835ed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
@@ -34,14 +34,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index de125c4..402da91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index ad5215b..dbbd917 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -27,7 +27,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index a07b84a..5eec8ac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -32,8 +32,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -41,7 +41,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
index 72fd50d..0d0e374 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -28,8 +28,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -37,7 +37,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
index 69103f8..5669585 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -44,7 +44,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -55,7 +55,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
index 2cbf52e..b573d5b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
@@ -27,7 +27,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -38,7 +38,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
@@ -49,7 +49,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
index 1b069c2..fc137f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -62,7 +62,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -73,7 +73,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
index fbffbda..a5c1b4c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
@@ -27,7 +27,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -54,7 +54,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -65,7 +65,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
index 1b069c2..fc137f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
+  FunctionCall asterix.similarity-jaccard@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=interests
@@ -62,7 +62,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -73,7 +73,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
index fbffbda..a5c1b4c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
@@ -27,7 +27,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
+      FunctionCall asterix.similarity-jaccard@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -54,7 +54,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=interests
@@ -65,7 +65,7 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.len@1[
+      FunctionCall asterix.len@1[
         FieldAccessor [
           Variable [ Name=$b ]
           Field=interests
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index e324f87..92400d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -31,14 +31,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
index 917d83b..de6332b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
@@ -27,14 +27,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
index bc3ef8f..50e412d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_01/len_01.3.ast
@@ -2,44 +2,44 @@
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     OrderedListConstructor [
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
       LiteralExpr [LONG] [3]
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     UnorderedListConstructor [
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     UnorderedListConstructor [
       LiteralExpr [LONG] [1]
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     UnorderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
     ]
   ]
-  FunctionCall test.len@1[
+  FunctionCall asterix.len@1[
     UnorderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_null_01/len_null_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_null_01/len_null_01.3.ast
index f23296e..4c811b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_null_01/len_null_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/list/len_null_01/len_null_01.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [len1]
     :
-    FunctionCall test.len@1[
+    FunctionCall asterix.len@1[
       OrderedListConstructor [
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
index 75a14fc..86d45c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [date-after]
     :
-    FunctionCall temp.date@1[
+    FunctionCall asterix.date@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=date
@@ -55,7 +55,7 @@
   (
     LiteralExpr [STRING] [time-after]
     :
-    FunctionCall temp.time@1[
+    FunctionCall asterix.time@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=time
@@ -73,7 +73,7 @@
   (
     LiteralExpr [STRING] [datetime-after]
     :
-    FunctionCall temp.datetime@1[
+    FunctionCall asterix.datetime@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=datetime
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
index 75a14fc..86d45c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [date-after]
     :
-    FunctionCall temp.date@1[
+    FunctionCall asterix.date@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=date
@@ -55,7 +55,7 @@
   (
     LiteralExpr [STRING] [time-after]
     :
-    FunctionCall temp.time@1[
+    FunctionCall asterix.time@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=time
@@ -73,7 +73,7 @@
   (
     LiteralExpr [STRING] [datetime-after]
     :
-    FunctionCall temp.datetime@1[
+    FunctionCall asterix.datetime@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=datetime
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
index 75a14fc..86d45c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [date-after]
     :
-    FunctionCall temp.date@1[
+    FunctionCall asterix.date@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=date
@@ -55,7 +55,7 @@
   (
     LiteralExpr [STRING] [time-after]
     :
-    FunctionCall temp.time@1[
+    FunctionCall asterix.time@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=time
@@ -73,7 +73,7 @@
   (
     LiteralExpr [STRING] [datetime-after]
     :
-    FunctionCall temp.datetime@1[
+    FunctionCall asterix.datetime@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=datetime
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
index 75a14fc..86d45c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [date-after]
     :
-    FunctionCall temp.date@1[
+    FunctionCall asterix.date@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=date
@@ -55,7 +55,7 @@
   (
     LiteralExpr [STRING] [time-after]
     :
-    FunctionCall temp.time@1[
+    FunctionCall asterix.time@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=time
@@ -73,7 +73,7 @@
   (
     LiteralExpr [STRING] [datetime-after]
     :
-    FunctionCall temp.datetime@1[
+    FunctionCall asterix.datetime@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=datetime
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
index 5d11c79..75e8b66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$t ]
 ,
-  FunctionCall twitter.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$t ]
       Field=text
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
index ca9f0b3..7ba0188 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
@@ -15,7 +15,7 @@
   (
     LiteralExpr [STRING] [user-lottery_numbers-len]
     :
-    FunctionCall test.len@1[
+    FunctionCall asterix.len@1[
       FieldAccessor [
         Variable [ Name=$user ]
         Field=lottery_numbers
@@ -25,7 +25,7 @@
   (
     LiteralExpr [STRING] [visitor-lottery_numbers-len]
     :
-    FunctionCall test.len@1[
+    FunctionCall asterix.len@1[
       FieldAccessor [
         Variable [ Name=$visitor ]
         Field=lottery_numbers
@@ -46,14 +46,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.len@1[
+    FunctionCall asterix.len@1[
       FieldAccessor [
         Variable [ Name=$user ]
         Field=lottery_numbers
       ]
     ]
     =
-    FunctionCall test.len@1[
+    FunctionCall asterix.len@1[
       FieldAccessor [
         Variable [ Name=$visitor ]
         Field=lottery_numbers
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
index d17917f..2cb138c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
@@ -16,14 +16,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.lowercase@1[
+      FunctionCall asterix.lowercase@1[
         FieldAccessor [
           Variable [ Name=$m ]
           Field=name
         ]
       ]
       =
-      FunctionCall test.lowercase@1[
+      FunctionCall asterix.lowercase@1[
         FieldAccessor [
           Variable [ Name=$l ]
           Field=name
@@ -32,14 +32,14 @@
     ]
     and
     OperatorExpr [
-      FunctionCall test.string-length@1[
+      FunctionCall asterix.string-length@1[
         FieldAccessor [
           Variable [ Name=$m ]
           Field=name
         ]
       ]
       =
-      FunctionCall test.string-length@1[
+      FunctionCall asterix.string-length@1[
         FieldAccessor [
           Variable [ Name=$l ]
           Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/year_01/year_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/year_01/year_01.3.ast
index 43d5ce0..153ee6a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/year_01/year_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/year_01/year_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.get-year@1[
+FunctionCall asterix.get-year@1[
   LiteralExpr [STRING] [1996-12-01]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
index 2ca5870..dcd9dd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$c ]
 ]
 Where
-  FunctionCall TinySocial.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
index 71ef449..60f04c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$c ]
 ]
 Where
-  FunctionCall TinySocial.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
@@ -17,12 +17,12 @@
       ]
       Field=sender-location
     ]
-    FunctionCall TinySocial.create-rectangle@2[
-      FunctionCall TinySocial.create-point@2[
+    FunctionCall asterix.create-rectangle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [0.0]
       ]
-      FunctionCall TinySocial.create-point@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [50.0]
         LiteralExpr [DOUBLE] [80.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
index 8300e7e..a7e3777 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
@@ -10,8 +10,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall TinySocial.similarity-jaccard-check@3[
-    FunctionCall TinySocial.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$c ]
@@ -20,7 +20,7 @@
         Field=name
       ]
     ]
-    FunctionCall TinySocial.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Nathan Giesen]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
index 9ce46c5..999e4e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
index 9ce46c5..999e4e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
index 8977eed..ca67b97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
index 8977eed..ca67b97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 943af65..04331ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -60,7 +60,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -111,7 +111,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
index 8117066..f584fa8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -106,7 +106,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 2de4faa..338d9fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -37,7 +37,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index 5629998..d87de27 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -33,7 +33,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index 8fb65e3..d1b9639 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -38,8 +38,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -50,7 +50,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
index 74328ad..cd5661b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -34,8 +34,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -46,7 +46,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 4881a92..f7abe91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -60,7 +60,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index cce9421..2282833 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -37,8 +37,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -47,7 +47,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
index 4a4a222..5be9b6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
@@ -33,8 +33,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -43,7 +43,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index 8117066..f584fa8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -106,7 +106,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 5fd6a09..09c197a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -126,7 +126,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
index f3cc092..c0449bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
@@ -67,7 +67,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.similarity-jaccard-check@3[
+        FunctionCall asterix.similarity-jaccard-check@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t1 ]
@@ -138,7 +138,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index 769e4cf..5abf3e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -67,7 +67,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t1 ]
@@ -138,7 +138,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 943af65..04331ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -60,7 +60,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -111,7 +111,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 14c38d5..03bf2e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -61,7 +61,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               FieldAccessor [
                 Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -131,7 +131,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 8825927..1bcf75d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -33,7 +33,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-contains@3[
+    FunctionCall asterix.edit-distance-contains@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 7dafb90..563b478 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index 627ab43..e2f8302 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -31,7 +31,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$paper ]
@@ -44,7 +44,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index 41a5216..b47036b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index d87360a..8fb87b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -14,8 +14,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -26,7 +26,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
index bb146ed..4e30ec5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
index b451307..91818e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
index 245e0a6..ad6c766 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
index 2b79329..53cc10b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 943af65..04331ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -60,7 +60,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -111,7 +111,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
index 8117066..f584fa8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -106,7 +106,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 2de4faa..338d9fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -37,7 +37,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index 5629998..d87de27 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -33,7 +33,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           FieldAccessor [
             Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index e1044f3..6439f72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -38,8 +38,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -50,7 +50,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
index f111822..5abf683 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -34,8 +34,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -46,7 +46,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 4881a92..f7abe91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -60,7 +60,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index cce9421..2282833 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -37,8 +37,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$a ]
@@ -47,7 +47,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
index 4a4a222..5be9b6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
@@ -33,8 +33,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$a ]
@@ -43,7 +43,7 @@
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index 8117066..f584fa8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -106,7 +106,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 5fd6a09..09c197a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -126,7 +126,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index 1b6e63e..e0496a1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -61,7 +61,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=message-text
@@ -123,7 +123,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 943af65..04331ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -60,7 +60,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             FieldAccessor [
               Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -111,7 +111,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 14c38d5..03bf2e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -61,7 +61,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               FieldAccessor [
                 Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$t1 ]
@@ -131,7 +131,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 8825927..1bcf75d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -33,7 +33,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-contains@3[
+    FunctionCall asterix.edit-distance-contains@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 7dafb90..563b478 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index 41a5216..b47036b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -13,7 +13,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index d87360a..8fb87b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -14,8 +14,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -26,7 +26,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index d9a04f1..8a58ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -12,7 +12,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 480570a..92d61f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -13,8 +13,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$o ]
@@ -23,7 +23,7 @@
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 6dbb3ea..5970091 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -21,7 +21,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       FieldAccessor [
         Variable [ Name=$o ]
@@ -29,7 +29,7 @@
       ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs0/abs0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs0/abs0.3.ast
index 406f256..45c3a40 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs0/abs0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs0/abs0.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs1/abs1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs1/abs1.3.ast
index 71c5830..069ced3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs1/abs1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs1/abs1.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs2/abs2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs2/abs2.3.ast
index 0f65e75..5c9be1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs2/abs2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs2/abs2.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs3/abs3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs3/abs3.3.ast
index 91fa426..7e934d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs3/abs3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs3/abs3.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs4/abs4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs4/abs4.3.ast
index 26f4e05..e328898 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs4/abs4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/abs4/abs4.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.abs@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.abs@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,21 +13,21 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.abs@1[
+    FunctionCall asterix.abs@1[
       - LiteralExpr [DOUBLE] [1.11]
     ]
   )
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.abs@1[
+    FunctionCall asterix.abs@1[
       LiteralExpr [DOUBLE] [12.9]
     ]
   )
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.abs@1[
+    FunctionCall asterix.abs@1[
       LiteralExpr [DOUBLE] [1.11]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_double/add_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_double/add_double.1.ast
index 7e1443c..8ddcd06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_double/add_double.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_double/add_double.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_float/add_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_float/add_float.1.ast
index 1e62488..167483e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_float/add_float.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_float/add_float.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int16/add_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int16/add_int16.1.ast
index 6deac21..01f5c46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int16/add_int16.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int16/add_int16.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int32/add_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int32/add_int32.1.ast
index ae05be5..9aa0183 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int32/add_int32.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int32/add_int32.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int64/add_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int64/add_int64.1.ast
index a63e244..93601a1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int64/add_int64.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int64/add_int64.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int8/add_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int8/add_int8.1.ast
index 3b2741d..f0e6e9d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int8/add_int8.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/add_int8/add_int8.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       +
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling0/ceiling0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling0/ceiling0.3.ast
index 971b343..23f481c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling0/ceiling0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling0/ceiling0.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling1/ceiling1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling1/ceiling1.3.ast
index 5c82b7f..4c09193 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling1/ceiling1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling1/ceiling1.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling2/ceiling2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling2/ceiling2.3.ast
index 94a56b5..2120ca2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling2/ceiling2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling2/ceiling2.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling3/ceiling3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling3/ceiling3.3.ast
index 741ba0b..f8003c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling3/ceiling3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling3/ceiling3.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling4/ceiling4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling4/ceiling4.3.ast
index 1179f48..3d282a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling4/ceiling4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/ceiling4/ceiling4.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.ceiling@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.ceiling@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,21 +13,21 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.ceiling@1[
+    FunctionCall asterix.ceiling@1[
       - LiteralExpr [DOUBLE] [1.11]
     ]
   )
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.ceiling@1[
+    FunctionCall asterix.ceiling@1[
       LiteralExpr [DOUBLE] [12.9]
     ]
   )
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.ceiling@1[
+    FunctionCall asterix.ceiling@1[
       LiteralExpr [DOUBLE] [1.11]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_double/divide_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_double/divide_double.1.ast
index 67d0694..6b2a436 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_double/divide_double.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_double/divide_double.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_float/divide_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_float/divide_float.1.ast
index 958937c..907094d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_float/divide_float.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_float/divide_float.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.1.ast
index 21f2d7f..92c636e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.2.ast
index f92b4c2..cb38eb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int16/divide_int16.2.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       div
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [1]
       ]
       div
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.1.ast
index 37785cf..5f2bfec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.2.ast
index 75eb726..e093f45 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int32/divide_int32.2.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       div
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [1]
       ]
       div
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.1.ast
index 22a3401..4e119e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.2.ast
index 8f295f3..2c265cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int64/divide_int64.2.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       div
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [1]
       ]
       div
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.1.ast
index 2243ace..60ee303 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       /
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-6]
       ]
       /
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
       /
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.2.ast
index f1e7dab..a3c05bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/divide_int8/divide_int8.2.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       div
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-6]
       ]
       div
@@ -108,7 +108,7 @@
     LiteralExpr [STRING] [result9]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [1]
       ]
       div
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor0/floor0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor0/floor0.3.ast
index d6d9169..859e589 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor0/floor0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor0/floor0.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor1/floor1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor1/floor1.3.ast
index 8f18c92..b2604a1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor1/floor1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor1/floor1.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor2/floor2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor2/floor2.3.ast
index 8ce77da..35b3d0a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor2/floor2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor2/floor2.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor3/floor3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor3/floor3.3.ast
index d08e4526..ef4bea2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor3/floor3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor3/floor3.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor4/floor4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor4/floor4.3.ast
index 1bb6af7..d8a5c1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor4/floor4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/floor4/floor4.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.floor@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.floor@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,21 +13,21 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.floor@1[
+    FunctionCall asterix.floor@1[
       - LiteralExpr [DOUBLE] [1.11]
     ]
   )
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.floor@1[
+    FunctionCall asterix.floor@1[
       LiteralExpr [DOUBLE] [12.9]
     ]
   )
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.floor@1[
+    FunctionCall asterix.floor@1[
       LiteralExpr [DOUBLE] [1.11]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_double/multiply_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_double/multiply_double.1.ast
index 42394d3..3f90469 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_double/multiply_double.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_double/multiply_double.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_float/multiply_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_float/multiply_float.1.ast
index 8568d10..8f6a1b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_float/multiply_float.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_float/multiply_float.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int16/multiply_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int16/multiply_int16.1.ast
index 6419ff0..8d8ebd6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int16/multiply_int16.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int16/multiply_int16.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int32/multiply_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int32/multiply_int32.1.ast
index 55a5562..5e08c01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int32/multiply_int32.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int32/multiply_int32.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int64/multiply_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int64/multiply_int64.1.ast
index 6498a56..3f0d0c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int64/multiply_int64.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int64/multiply_int64.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int8/multiply_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int8/multiply_int8.1.ast
index 2487b68..6f31dcc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int8/multiply_int8.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/multiply_int8/multiply_int8.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       *
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       *
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.ast
index 9c771d2..29df6f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even0/round-half-to-even0.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.ast
index 28d6297..eeb7203 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even1/round-half-to-even1.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even2/round-half-to-even2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even2/round-half-to-even2.3.ast
index 6007940..3800d98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even2/round-half-to-even2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even2/round-half-to-even2.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.5]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.5]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.ast
index 811c63a..5d6218f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even20/round-half-to-even20.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
       LiteralExpr [LONG] [2]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
       LiteralExpr [LONG] [2]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
       LiteralExpr [LONG] [2]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
       LiteralExpr [LONG] [2]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
       LiteralExpr [LONG] [2]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
       LiteralExpr [LONG] [2]
@@ -64,8 +64,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
       LiteralExpr [LONG] [2]
@@ -74,8 +74,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.ast
index b3d1598..3ae6e0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even21/round-half-to-even21.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
       LiteralExpr [LONG] [2]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
       LiteralExpr [LONG] [2]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
       LiteralExpr [LONG] [2]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
       LiteralExpr [LONG] [2]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
       LiteralExpr [LONG] [2]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
       LiteralExpr [LONG] [2]
@@ -64,8 +64,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
       LiteralExpr [LONG] [2]
@@ -74,8 +74,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even22/round-half-to-even22.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even22/round-half-to-even22.3.ast
index 0e2608e..94970f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even22/round-half-to-even22.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even22/round-half-to-even22.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.555]
       ]
       LiteralExpr [LONG] [2]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.322]
       ]
       LiteralExpr [LONG] [2]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
       LiteralExpr [LONG] [3]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
       LiteralExpr [LONG] [4]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
       LiteralExpr [LONG] [5]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
       LiteralExpr [LONG] [6]
@@ -64,8 +64,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
       LiteralExpr [LONG] [0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even23/round-half-to-even23.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even23/round-half-to-even23.3.ast
index 1797fdb..ed2d30a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even23/round-half-to-even23.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even23/round-half-to-even23.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.555]
       ]
       LiteralExpr [LONG] [2]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.322]
       ]
       LiteralExpr [LONG] [2]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
       LiteralExpr [LONG] [3]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
       LiteralExpr [LONG] [4]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
       LiteralExpr [LONG] [5]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
       LiteralExpr [LONG] [6]
@@ -64,8 +64,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
       LiteralExpr [LONG] [0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even24/round-half-to-even24.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even24/round-half-to-even24.3.ast
index 80b6d09..f45c1b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even24/round-half-to-even24.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even24/round-half-to-even24.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.015]
       ]
       LiteralExpr [LONG] [2]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.025]
       ]
       LiteralExpr [LONG] [2]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [3.567812E+3]
       ]
       LiteralExpr [LONG] [2]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [4.7564E-3]
       ]
       LiteralExpr [LONG] [2]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.round-half-to-even@2[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@2[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [35612.25]
       ]
       - LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even3/round-half-to-even3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even3/round-half-to-even3.3.ast
index 3376733..01f409e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even3/round-half-to-even3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even3/round-half-to-even3.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.5]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.5]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even4/round-half-to-even4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even4/round-half-to-even4.3.ast
index 1b4eb21..ce46291 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even4/round-half-to-even4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even4/round-half-to-even4.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [1.5]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [2.5]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.ast
index e2e0f27..1c5f143 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round-half-to-even5/round-half-to-even5.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round-half-to-even@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round-half-to-even@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,21 +13,21 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round-half-to-even@1[
+    FunctionCall asterix.round-half-to-even@1[
       - LiteralExpr [DOUBLE] [1.5]
     ]
   )
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round-half-to-even@1[
+    FunctionCall asterix.round-half-to-even@1[
       LiteralExpr [DOUBLE] [12.5]
     ]
   )
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round-half-to-even@1[
+    FunctionCall asterix.round-half-to-even@1[
       LiteralExpr [DOUBLE] [1.5]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round0/round0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round0/round0.3.ast
index f41a151..9a5ddb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round0/round0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round0/round0.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-0]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [0]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round1/round1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round1/round1.3.ast
index ae7b4ce..7d0a2b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round1/round1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round1/round1.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [-23]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [-29]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-21]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [20]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int16@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [22]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int32@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [23]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [f7]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int64@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [27]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round2/round2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round2/round2.3.ast
index c6fd56d..b2966af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round2/round2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round2/round2.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [f4]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [f5]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [f6]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.float@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round3/round3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round3/round3.3.ast
index 6abd653..83b6831c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round3/round3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round3/round3.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [d0]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [20.1]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [d1]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-20.56e-30]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [d2]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [NaN]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [d3]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [INF]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [d4]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-INF]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [d5]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-0.0]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [d6]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.double@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [0.0]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round4/round4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round4/round4.3.ast
index e446715..8dd3e3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round4/round4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/round4/round4.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [f0]
     :
-    FunctionCall test.round@1[
-      FunctionCall test.int8@1[
+    FunctionCall asterix.round@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [-20]
       ]
     ]
@@ -13,21 +13,21 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.round@1[
+    FunctionCall asterix.round@1[
       - LiteralExpr [DOUBLE] [1.11]
     ]
   )
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.round@1[
+    FunctionCall asterix.round@1[
       LiteralExpr [DOUBLE] [12.9]
     ]
   )
   (
     LiteralExpr [STRING] [f3]
     :
-    FunctionCall test.round@1[
+    FunctionCall asterix.round@1[
       LiteralExpr [DOUBLE] [1.11]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_double/subtract_double.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_double/subtract_double.1.ast
index b6a0800..b15d3b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_double/subtract_double.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_double/subtract_double.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_float/subtract_float.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_float/subtract_float.1.ast
index 607e329..425174b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_float/subtract_float.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_float/subtract_float.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int16/subtract_int16.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int16/subtract_int16.1.ast
index a82b04c..4d3157a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int16/subtract_int16.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int16/subtract_int16.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int32/subtract_int32.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int32/subtract_int32.1.ast
index 1d60412..7e8789b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int32/subtract_int32.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int32/subtract_int32.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int64/subtract_int64.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int64/subtract_int64.1.ast
index 91964c1..9d8a11f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int64/subtract_int64.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int64/subtract_int64.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int8/subtract_int8.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int8/subtract_int8.1.ast
index dd072ac..f6c2f81b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int8/subtract_int8.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/subtract_int8/subtract_int8.1.ast
@@ -4,11 +4,11 @@
     LiteralExpr [STRING] [result1]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
     ]
@@ -17,11 +17,11 @@
     LiteralExpr [STRING] [result2]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.int16@1[
+      FunctionCall asterix.int16@1[
         LiteralExpr [STRING] [2]
       ]
     ]
@@ -30,11 +30,11 @@
     LiteralExpr [STRING] [result3]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.int32@1[
+      FunctionCall asterix.int32@1[
         LiteralExpr [STRING] [+3]
       ]
     ]
@@ -43,11 +43,11 @@
     LiteralExpr [STRING] [result4]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.int64@1[
+      FunctionCall asterix.int64@1[
         LiteralExpr [STRING] [-4]
       ]
     ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [result5]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.float@1[
+      FunctionCall asterix.float@1[
         LiteralExpr [STRING] [-5.5f]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [result6]
     :
     OperatorExpr [
-      FunctionCall null.int8@1[
+      FunctionCall asterix.int8@1[
         LiteralExpr [STRING] [+1]
       ]
       -
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
     ]
@@ -82,7 +82,7 @@
     LiteralExpr [STRING] [result7]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
@@ -93,7 +93,7 @@
     LiteralExpr [STRING] [result8]
     :
     OperatorExpr [
-      FunctionCall null.double@1[
+      FunctionCall asterix.double@1[
         LiteralExpr [STRING] [-6.5d]
       ]
       -
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_double_02/unary-minus_double_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_double_02/unary-minus_double_02.3.ast
index c74b17a..8c13b77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_double_02/unary-minus_double_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_double_02/unary-minus_double_02.3.ast
@@ -4,28 +4,28 @@
   (
     LiteralExpr [STRING] [double1]
     :
-    - FunctionCall test.double@1[
+    - FunctionCall asterix.double@1[
   LiteralExpr [STRING] [-20.56e-30]
 ]
   )
   (
     LiteralExpr [STRING] [double2]
     :
-    - FunctionCall test.double@1[
+    - FunctionCall asterix.double@1[
   LiteralExpr [STRING] [NaN]
 ]
   )
   (
     LiteralExpr [STRING] [double3]
     :
-    - FunctionCall test.double@1[
+    - FunctionCall asterix.double@1[
   LiteralExpr [STRING] [INF]
 ]
   )
   (
     LiteralExpr [STRING] [double4]
     :
-    - FunctionCall test.double@1[
+    - FunctionCall asterix.double@1[
   LiteralExpr [STRING] [-INF]
 ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_float_02/unary-minus_float_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_float_02/unary-minus_float_02.3.ast
index cd38a0c..6cf7762 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_float_02/unary-minus_float_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_float_02/unary-minus_float_02.3.ast
@@ -4,28 +4,28 @@
   (
     LiteralExpr [STRING] [float1]
     :
-    - FunctionCall test.float@1[
+    - FunctionCall asterix.float@1[
   LiteralExpr [STRING] [-80.20f]
 ]
   )
   (
     LiteralExpr [STRING] [float2]
     :
-    - FunctionCall test.float@1[
+    - FunctionCall asterix.float@1[
   LiteralExpr [STRING] [NaN]
 ]
   )
   (
     LiteralExpr [STRING] [float3]
     :
-    - FunctionCall test.float@1[
+    - FunctionCall asterix.float@1[
   LiteralExpr [STRING] [INF]
 ]
   )
   (
     LiteralExpr [STRING] [float4]
     :
-    - FunctionCall test.float@1[
+    - FunctionCall asterix.float@1[
   LiteralExpr [STRING] [-INF]
 ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.ast
index b37a097..4469767 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/numeric/unary-minus_int_02/unary-minus_int_02.3.ast
@@ -4,28 +4,28 @@
   (
     LiteralExpr [STRING] [int8]
     :
-    - FunctionCall test.int8@1[
+    - FunctionCall asterix.int8@1[
   LiteralExpr [STRING] [+80]
 ]
   )
   (
     LiteralExpr [STRING] [int16]
     :
-    - FunctionCall test.int16@1[
+    - FunctionCall asterix.int16@1[
   LiteralExpr [STRING] [160]
 ]
   )
   (
     LiteralExpr [STRING] [int32]
     :
-    - FunctionCall test.int32@1[
+    - FunctionCall asterix.int32@1[
   LiteralExpr [STRING] [+320]
 ]
   )
   (
     LiteralExpr [STRING] [int64]
     :
-    - FunctionCall test.int64@1[
+    - FunctionCall asterix.int64@1[
   LiteralExpr [STRING] [-640]
 ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
index a24813d..de7eb1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
@@ -2,7 +2,7 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.closed-object-constructor@8[
+FunctionCall asterix.closed-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
index 0fd5e43..f38fc1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
@@ -2,11 +2,11 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.closed-object-constructor@8[
+FunctionCall asterix.closed-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-object-constructor@12[
+  FunctionCall asterix.closed-object-constructor@12[
     LiteralExpr [STRING] [bar1.1]
     LiteralExpr [LONG] [10]
     LiteralExpr [STRING] [bar1.2]
@@ -14,7 +14,7 @@
     LiteralExpr [STRING] [bar1.3]
     LiteralExpr [LONG] [30]
     LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-object-constructor@8[
+    FunctionCall asterix.closed-object-constructor@8[
       LiteralExpr [STRING] [bar1.4.1]
       LiteralExpr [LONG] [10]
       LiteralExpr [STRING] [bar1.4.2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast
index 9d46669..b42dcbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Set import-private-functions=true
 Query:
-FunctionCall test.field-access-by-index@2[
+FunctionCall asterix.field-access-by-index@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [foo1]
@@ -24,7 +24,7 @@
       LiteralExpr [LONG] [40]
     )
   ]
-  FunctionCall test.int32@1[
+  FunctionCall asterix.int32@1[
     LiteralExpr [STRING] [2]
   ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
index 288ed48..c6f1ae8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-object-field-value@2[
+FunctionCall asterix.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
index b95a864..5f98520 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-object-field-value@2[
+FunctionCall asterix.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
index 8f5b139..597ce85 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-object-field-value@2[
+FunctionCall asterix.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
index da3d608..19c9bbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-object-field-value@2[
+  FunctionCall asterix.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
index da3d608..19c9bbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-object-field-value@2[
+  FunctionCall asterix.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
index da3d608..19c9bbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-object-field-value@2[
+  FunctionCall asterix.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
index 094696a..7104620 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
@@ -8,14 +8,14 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-object-fields@1[
+  FunctionCall asterix.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall TinySocial.get-object-field-value@2[
+  FunctionCall asterix.get-object-field-value@2[
     Variable [ Name=$r ]
     FieldAccessor [
       Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.5.ast
index 6b1c326..8bc07a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-field-value@2[
+FunctionCall asterix.get-object-field-value@2[
   FieldAccessor [
     Variable [ Name=$m ]
     Field=user
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
index f5041fd..4f04f52 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
index 5187e59..14f1b1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
index fda0f22..1ad68f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
index 422509b..a7401d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
index a15e713..e19db54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
index acd08a9..e007565 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
index fadda54..5b62b89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-object-fields@1[
+  FunctionCall asterix.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
index 5187e59..14f1b1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
index fda0f22..1ad68f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
index 422509b..a7401d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
index a15e713..e19db54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
index acd08a9..e007565 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
index fadda54..5b62b89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-object-fields@1[
+  FunctionCall asterix.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.10.ast
index e6b376b..849fd69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.10.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   FieldAccessor [
     Variable [ Name=$message ]
     Field=user
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
index 5187e59..14f1b1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
index fda0f22..1ad68f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
index 422509b..a7401d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
index a15e713..e19db54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
index acd08a9..e007565 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-object-fields@1[
+FunctionCall asterix.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
index fadda54..5b62b89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-object-fields@1[
+  FunctionCall asterix.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
index 4cd24d8..5fbcee8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
@@ -11,7 +11,7 @@
     LiteralExpr [STRING] [smith]
   )
   (
-    FunctionCall test.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [NAME]
     ]
     :
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
index 508889a..a94db4a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
@@ -2,7 +2,7 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.open-object-constructor@8[
+FunctionCall asterix.open-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
index 98594db..0599ad9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
@@ -2,11 +2,11 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.open-object-constructor@8[
+FunctionCall asterix.open-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-object-constructor@12[
+  FunctionCall asterix.closed-object-constructor@12[
     LiteralExpr [STRING] [bar1.1]
     LiteralExpr [LONG] [10]
     LiteralExpr [STRING] [bar1.2]
@@ -14,7 +14,7 @@
     LiteralExpr [STRING] [bar1.3]
     LiteralExpr [LONG] [30]
     LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-object-constructor@8[
+    FunctionCall asterix.closed-object-constructor@8[
       LiteralExpr [STRING] [bar1.4.1]
       LiteralExpr [LONG] [10]
       LiteralExpr [STRING] [bar1.4.2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
index 4a0cf5b..e34ad23 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
@@ -39,7 +39,7 @@
         Field=send-time
       ]
       >=
-      FunctionCall OpenSocialNetworkData.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2005-04-13T17:17:22]
       ]
     ]
@@ -50,7 +50,7 @@
         Field=send-time
       ]
       <=
-      FunctionCall OpenSocialNetworkData.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-04-13T17:18:22]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
index 599d473..85f03ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
@@ -57,7 +57,7 @@
           ]
         ]
         Satifies [
-          FunctionCall test.contains@2[
+          FunctionCall asterix.contains@2[
             Variable [ Name=$topic ]
             LiteralExpr [STRING] [verizon]
           ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
index b005051..9815371 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
@@ -47,7 +47,7 @@
       ]
     ]
     Satifies [
-      FunctionCall test.contains@2[
+      FunctionCall asterix.contains@2[
         Variable [ Name=$reftopic ]
         LiteralExpr [STRING] [verizon]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 5d4c69d..8dfee3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -48,7 +48,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -73,7 +73,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -87,7 +87,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
index caf47d3..204a6a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -82,7 +82,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
index 2f985dc..0345c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index de125c4..402da91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -31,7 +31,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance@2[
+  FunctionCall asterix.edit-distance@2[
     FieldAccessor [
       Variable [ Name=$a ]
       Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index ad5215b..dbbd917 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -27,7 +27,7 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.edit-distance@2[
+      FunctionCall asterix.edit-distance@2[
         FieldAccessor [
           Variable [ Name=$a ]
           Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index b5e2450..7860328 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -32,8 +32,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
@@ -41,7 +41,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
index 09fc922..110370a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -28,8 +28,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.gram-tokens@3[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
@@ -37,7 +37,7 @@
           LiteralExpr [LONG] [3]
           LiteralExpr [FALSE]
         ]
-        FunctionCall test.gram-tokens@3[
+        FunctionCall asterix.gram-tokens@3[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 939c13a..676c6d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -48,7 +48,7 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index 3f3db25..2c08c13 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -31,14 +31,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard@2[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard@2[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$b ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
index 9689853..009bbdd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
@@ -27,14 +27,14 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall test.similarity-jaccard@2[
-        FunctionCall test.word-tokens@1[
+      FunctionCall asterix.similarity-jaccard@2[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$a ]
             Field=title
           ]
         ]
-        FunctionCall test.word-tokens@1[
+        FunctionCall asterix.word-tokens@1[
           FieldAccessor [
             Variable [ Name=$b ]
             Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index caf47d3..204a6a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -82,7 +82,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 63d8847..eab57b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -96,7 +96,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index 67155b4..d4bad51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -55,7 +55,7 @@
       ]
       Let Variable [ Name=$sim ]
         :=
-        FunctionCall test.edit-distance-check@3[
+        FunctionCall asterix.edit-distance-check@3[
           FieldAccessor [
             Variable [ Name=$t1 ]
             Field=message-text
@@ -108,7 +108,7 @@
       Field=tweetid
     ]
     >
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [240]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 5d4c69d..8dfee3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -48,7 +48,7 @@
         AS Variable [ Name=$t2 ]
       ]
       Where
-        FunctionCall test.spatial-intersect@2[
+        FunctionCall asterix.spatial-intersect@2[
           FieldAccessor [
             Variable [ Name=$t2 ]
             Field=sender-location
@@ -73,7 +73,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -87,7 +87,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index e88a804..1563d4c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -49,7 +49,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall test.spatial-intersect@2[
+          FunctionCall asterix.spatial-intersect@2[
             FieldAccessor [
               Variable [ Name=$t2 ]
               Field=sender-location
@@ -87,7 +87,7 @@
 ]
 Let Variable [ Name=$n ]
   :=
-  FunctionCall test.create-circle@2[
+  FunctionCall asterix.create-circle@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=sender-location
@@ -101,7 +101,7 @@
       Field=tweetid
     ]
     <
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [10]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index 8c4e3f1..6035e94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -50,7 +50,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 0f93d91..6d19d11 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -27,7 +27,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-contains@3[
+    FunctionCall asterix.edit-distance-contains@3[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index adc3eb8..b49f0bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -51,7 +51,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index 204b85c..6dd3c31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -25,7 +25,7 @@
   ]
   AS Variable [ Name=$paper ]
 ,
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -35,7 +35,7 @@
 ]
 Where
   IndexAccessor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$word ]
       LiteralExpr [STRING] [Multmedia]
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index b63ea47..2622dc7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -51,7 +51,7 @@
 ]
 Let Variable [ Name=$ed ]
   :=
-  FunctionCall test.edit-distance-check@3[
+  FunctionCall asterix.edit-distance-check@3[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=authors
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index 5f71699..ef34f46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -52,8 +52,8 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.gram-tokens@3[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
@@ -61,7 +61,7 @@
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.gram-tokens@3[
+    FunctionCall asterix.gram-tokens@3[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index 8c4e3f1..6035e94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -50,7 +50,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=title
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 9dfa690..df58c21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -51,14 +51,14 @@
 ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
-    FunctionCall test.word-tokens@1[
+  FunctionCall asterix.similarity-jaccard-check@3[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$o ]
         Field=title
       ]
     ]
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 74ea6fe4..5f460d8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-polygon@1[
+    FunctionCall asterix.create-polygon@1[
       OrderedListConstructor [
         LiteralExpr [DOUBLE] [4.0]
         LiteralExpr [DOUBLE] [1.0]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_ints/edit-distance-check_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_ints/edit-distance-check_ints.3.ast
index b8c478a..3e66c49 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_ints/edit-distance-check_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_ints/edit-distance-check_ints.3.ast
@@ -24,22 +24,22 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [2]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_strings/edit-distance-check_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_strings/edit-distance-check_strings.3.ast
index febad20..7bdabbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_strings/edit-distance-check_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_strings/edit-distance-check_strings.3.ast
@@ -9,22 +9,22 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [2]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_unicode/edit-distance-check_unicode.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_unicode/edit-distance-check_unicode.3.ast
index dcf6a2d..7768118 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_unicode/edit-distance-check_unicode.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-check_unicode/edit-distance-check_unicode.3.ast
@@ -12,22 +12,22 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [1]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [LONG] [1]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$c ]
       LiteralExpr [LONG] [1]
     ]
-    FunctionCall test.edit-distance-check@3[
+    FunctionCall asterix.edit-distance-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$b ]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.ast
index ead9c7c..d9dd240 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-list-is-filterable/edit-distance-list-is-filterable.3.ast
@@ -22,27 +22,27 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [0]
     ]
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [0]
     ]
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [3]
     ]
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [8]
     ]
-    FunctionCall test.edit-distance-list-is-filterable@2[
+    FunctionCall asterix.edit-distance-list-is-filterable@2[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [11]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.ast
index bbac9fd..7d4fe2b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance-string-is-filterable/edit-distance-string-is-filterable.3.ast
@@ -10,121 +10,121 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$a ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [4]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [5]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [5]
       LiteralExpr [LONG] [2]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [6]
       LiteralExpr [LONG] [2]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [3]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [3]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [2]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [3]
       LiteralExpr [LONG] [3]
       LiteralExpr [TRUE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [3]
       LiteralExpr [LONG] [3]
       LiteralExpr [FALSE]
     ]
-    FunctionCall test.edit-distance-string-is-filterable@4[
+    FunctionCall asterix.edit-distance-string-is-filterable@4[
       Variable [ Name=$b ]
       LiteralExpr [LONG] [4]
       LiteralExpr [LONG] [3]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_ints/edit-distance_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_ints/edit-distance_ints.3.ast
index 26aedbf..09318cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_ints/edit-distance_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_ints/edit-distance_ints.3.ast
@@ -24,11 +24,11 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_strings/edit-distance_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_strings/edit-distance_strings.3.ast
index c47f7fa..48b6baf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_strings/edit-distance_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/edit-distance_strings/edit-distance_strings.3.ast
@@ -9,11 +9,11 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.edit-distance@2[
+    FunctionCall asterix.edit-distance@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
index 640a665..f0ccd53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
@@ -12,14 +12,14 @@
 ]
 Where
   OperatorExpr [
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       FieldAccessor [
         Variable [ Name=$paper ]
         Field=title
       ]
     ]
     ~=
-    FunctionCall test.word-tokens@1[
+    FunctionCall asterix.word-tokens@1[
       LiteralExpr [STRING] [Transactions for Cooperative Environments]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/prefix-len-jaccard/prefix-len-jaccard.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/prefix-len-jaccard/prefix-len-jaccard.3.ast
index 40c2b99..a3ccf8c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/prefix-len-jaccard/prefix-len-jaccard.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/prefix-len-jaccard/prefix-len-jaccard.3.ast
@@ -3,27 +3,27 @@
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [5]
     LiteralExpr [FLOAT] [0.8]
   ]
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [5]
     LiteralExpr [FLOAT] [0.9]
   ]
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [10]
     LiteralExpr [FLOAT] [0.8]
   ]
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [10]
     LiteralExpr [FLOAT] [0.9]
   ]
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [15]
     LiteralExpr [FLOAT] [0.8]
   ]
-  FunctionCall test.prefix-len-jaccard@2[
+  FunctionCall asterix.prefix-len-jaccard@2[
     LiteralExpr [LONG] [15]
     LiteralExpr [FLOAT] [0.9]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.ast
index fd29ffd..847d235 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_ints/similarity-jaccard-check_ints.3.ast
@@ -70,62 +70,62 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.05]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.05]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
index 465525c..dfc3031 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -18,12 +18,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Environments for Cooperative Transactions]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-check@3[
+  FunctionCall asterix.similarity-jaccard-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.ast
index ce37445..83d4ab5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings/similarity-jaccard-check_strings.3.ast
@@ -95,82 +95,82 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$g ]
       Variable [ Name=$h ]
       LiteralExpr [FLOAT] [0.05]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$h ]
       Variable [ Name=$g ]
       LiteralExpr [FLOAT] [0.05]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$g ]
       Variable [ Name=$h ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$h ]
       Variable [ Name=$g ]
       LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings_issue628/similarity-jaccard-check_strings_issue628.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings_issue628/similarity-jaccard-check_strings_issue628.3.ast
index a552729..6be3a31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings_issue628/similarity-jaccard-check_strings_issue628.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_strings_issue628/similarity-jaccard-check_strings_issue628.3.ast
@@ -56,17 +56,17 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$v1 ]
       Variable [ Name=$v2 ]
       LiteralExpr [FLOAT] [0.5]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$v1 ]
       Variable [ Name=$v3 ]
       LiteralExpr [FLOAT] [0.5]
     ]
-    FunctionCall test.similarity-jaccard-check@3[
+    FunctionCall asterix.similarity-jaccard-check@3[
       Variable [ Name=$v4 ]
       Variable [ Name=$v5 ]
       LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.ast
index fc78deb..090fc42 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix-check/similarity-jaccard-prefix-check.3.ast
@@ -3,7 +3,7 @@
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -19,7 +19,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [1.0]
   ]
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -35,7 +35,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -51,7 +51,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.6]
   ]
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -67,7 +67,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [4]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -83,7 +83,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix-check@6[
+  FunctionCall asterix.similarity-jaccard-prefix-check@6[
     LiteralExpr [LONG] [4]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.ast
index 4267e4a..fc4806b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-prefix/similarity-jaccard-prefix.3.ast
@@ -3,7 +3,7 @@
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -19,7 +19,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [1.0]
   ]
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -35,7 +35,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -51,7 +51,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.6]
   ]
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [3]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -67,7 +67,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [4]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
@@ -83,7 +83,7 @@
     LiteralExpr [LONG] [1]
     LiteralExpr [FLOAT] [0.5]
   ]
-  FunctionCall test.similarity-jaccard-prefix@6[
+  FunctionCall asterix.similarity-jaccard-prefix@6[
     LiteralExpr [LONG] [4]
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.ast
index f8ff3ee..2380b01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_ints/similarity-jaccard-sorted-check_ints.3.ast
@@ -42,42 +42,42 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
index df3273d..de0b41c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
@@ -11,7 +11,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -19,12 +19,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Cooperative Transactions for Environments]
   ]
 Let Variable [ Name=$jacc ]
   :=
-  FunctionCall test.similarity-jaccard-sorted-check@3[
+  FunctionCall asterix.similarity-jaccard-sorted-check@3[
     Variable [ Name=$paper_tokens ]
     Variable [ Name=$query_tokens ]
     LiteralExpr [FLOAT] [0.5]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.ast
index c4a3047..220888c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_strings/similarity-jaccard-sorted-check_strings.3.ast
@@ -67,62 +67,62 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.0]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
       LiteralExpr [FLOAT] [0.1]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.6]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
       LiteralExpr [FLOAT] [0.8]
     ]
-    FunctionCall test.similarity-jaccard-sorted-check@3[
+    FunctionCall asterix.similarity-jaccard-sorted-check@3[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
       LiteralExpr [FLOAT] [0.8]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.ast
index 76b8506..f79b1d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_ints/similarity-jaccard-sorted_ints.3.ast
@@ -42,19 +42,19 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
index 9a2a37d..5f730b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
@@ -11,7 +11,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -19,12 +19,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Cooperative Transactions for Environments]
   ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$paper_tokens ]
       Variable [ Name=$query_tokens ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.ast
index e346514..1efc13b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_strings/similarity-jaccard-sorted_strings.3.ast
@@ -67,27 +67,27 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
     ]
-    FunctionCall test.similarity-jaccard-sorted@2[
+    FunctionCall asterix.similarity-jaccard-sorted@2[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.ast
index 1684619..0bc8058 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_ints/similarity-jaccard_ints.3.ast
@@ -67,27 +67,27 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
index 01d099d..66162f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
@@ -11,7 +11,7 @@
 ]
 Let Variable [ Name=$paper_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     FieldAccessor [
       Variable [ Name=$paper ]
       Field=title
@@ -19,12 +19,12 @@
   ]
 Let Variable [ Name=$query_tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     LiteralExpr [STRING] [Transactions for Cooperative Environments]
   ]
 Where
   OperatorExpr [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$paper_tokens ]
       Variable [ Name=$query_tokens ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.ast
index 7bb6897..050651f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_strings/similarity-jaccard_strings.3.ast
@@ -92,35 +92,35 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$g ]
       Variable [ Name=$h ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$h ]
       Variable [ Name=$g ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
index 1e51fca..e6f48db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
@@ -24,7 +24,7 @@
   LiteralExpr [STRING] [Allergies]
 Let Variable [ Name=$region ]
   :=
-  FunctionCall test.polygon@1[
+  FunctionCall asterix.polygon@1[
     LiteralExpr [STRING] [
 	33.80503407287759,-126.41235263538363
 	44.9090773200516,-126.41235263538363
@@ -33,7 +33,7 @@
   ]
 Where
   OperatorExpr [
-    FunctionCall test.spatial-intersect@2[
+    FunctionCall asterix.spatial-intersect@2[
       FieldAccessor [
         Variable [ Name=$t ]
         Field=loc
@@ -47,7 +47,7 @@
         Field=time
       ]
       >
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-05-15T00:00:00Z]
       ]
     ]
@@ -58,12 +58,12 @@
         Field=time
       ]
       <
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2011-05-16T23:59:59Z]
       ]
     ]
     and
-    FunctionCall test.contains@2[
+    FunctionCall asterix.contains@2[
       FieldAccessor [
         Variable [ Name=$t ]
         Field=text
@@ -74,12 +74,12 @@
 Groupby
   Variable [ Name=$c ]
   :=
-  FunctionCall test.spatial-cell@4[
+  FunctionCall asterix.spatial-cell@4[
     FieldAccessor [
       Variable [ Name=$t ]
       Field=loc
     ]
-    FunctionCall test.create-point@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [24.5]
       - LiteralExpr [DOUBLE] [125.5]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
index ddd9e25..cf043bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
@@ -25,12 +25,12 @@
     Groupby
       Variable [ Name=$c ]
       :=
-      FunctionCall test.spatial-cell@4[
+      FunctionCall asterix.spatial-cell@4[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=loc
         ]
-        FunctionCall test.create-point@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [0.0]
           LiteralExpr [DOUBLE] [0.0]
         ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
index 576e12e..93ed41b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
@@ -18,9 +18,9 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+  FunctionCall asterix.spatial-intersect@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [0.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle_accessor/circle_accessor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle_accessor/circle_accessor.3.ast
index 7a462d1..3d6a650 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle_accessor/circle_accessor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle_accessor/circle_accessor.3.ast
@@ -4,9 +4,9 @@
   (
     LiteralExpr [STRING] [circle-radius]
     :
-    FunctionCall test.get-radius@1[
-      FunctionCall test.create-circle@2[
-        FunctionCall test.create-point@2[
+    FunctionCall asterix.get-radius@1[
+      FunctionCall asterix.create-circle@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [6.0]
           LiteralExpr [DOUBLE] [3.0]
         ]
@@ -17,9 +17,9 @@
   (
     LiteralExpr [STRING] [circle-center]
     :
-    FunctionCall test.get-center@1[
-      FunctionCall test.create-circle@2[
-        FunctionCall test.create-point@2[
+    FunctionCall asterix.get-center@1[
+      FunctionCall asterix.create-circle@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [6.0]
           LiteralExpr [DOUBLE] [3.0]
         ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
index 806c6d3..45f82af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
@@ -24,12 +24,12 @@
 ]
 Let Variable [ Name=$distance ]
   :=
-  FunctionCall test.spatial-distance@2[
+  FunctionCall asterix.spatial-distance@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-point@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [0.0]
       LiteralExpr [DOUBLE] [0.0]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
index 4c5531f..5a39f3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
@@ -18,13 +18,13 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=line1
     ]
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [0.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
index c81ec44..10c36a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=line1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
index 7e39b21..1a019cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=line1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
index a5c81e2..d6feab2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=line1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line_accessor/line_accessor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line_accessor/line_accessor.3.ast
index 44be116..a438d85 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line_accessor/line_accessor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line_accessor/line_accessor.3.ast
@@ -2,19 +2,19 @@
 Query:
 Let Variable [ Name=$line ]
   :=
-  FunctionCall test.create-line@2[
-    FunctionCall test.create-point@2[
+  FunctionCall asterix.create-line@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [100.6]
       LiteralExpr [DOUBLE] [999.4]
     ]
-    FunctionCall test.create-point@2[
+    FunctionCall asterix.create-point@2[
       - LiteralExpr [DOUBLE] [872.0]
       - LiteralExpr [DOUBLE] [876.9]
     ]
   ]
 Let Variable [ Name=$line_list ]
   :=
-  FunctionCall test.get-points@1[
+  FunctionCall asterix.get-points@1[
     Variable [ Name=$line ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
index aaf9a36..d4b7021 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
@@ -18,12 +18,12 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-point@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [5.0]
       LiteralExpr [DOUBLE] [1.0]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
index ae6469b..b7ccc5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
@@ -18,13 +18,13 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
     ]
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [0.0]
         LiteralExpr [DOUBLE] [0.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
index f614085..b6fbb36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
index 75c6087..f7f8923 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
index a47745c..2e0dbf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=point
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point_accessor/point_accessor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point_accessor/point_accessor.3.ast
index 6d5fe7e..e15bbf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point_accessor/point_accessor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point_accessor/point_accessor.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [x-coordinate]
     :
-    FunctionCall test.get-x@1[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.get-x@1[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [2.3]
         LiteralExpr [DOUBLE] [5.0]
       ]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [y-coordinate]
     :
-    FunctionCall test.get-y@1[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.get-y@1[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [2.3]
         LiteralExpr [DOUBLE] [5.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
index 783c331..e0dc871 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
@@ -18,13 +18,13 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=poly1
     ]
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [6.0]
         LiteralExpr [DOUBLE] [3.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
index 65f6dea..e908a58 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=poly1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
index 87b6006..7f39534 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
@@ -18,7 +18,7 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=poly1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
index 437f047..dafc1ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon_accessor/polygon_accessor.3.ast
@@ -2,7 +2,7 @@
 Query:
 Let Variable [ Name=$polygon ]
   :=
-  FunctionCall test.create-polygon@1[
+  FunctionCall asterix.create-polygon@1[
     OrderedListConstructor [
       LiteralExpr [DOUBLE] [1.0]
       LiteralExpr [DOUBLE] [1.0]
@@ -16,7 +16,7 @@
   ]
 Let Variable [ Name=$polygon_list ]
   :=
-  FunctionCall test.get-points@1[
+  FunctionCall asterix.get-points@1[
     Variable [ Name=$polygon ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
index 0c3d894..aa6a274 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
@@ -18,13 +18,13 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=rec
     ]
-    FunctionCall test.create-circle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-circle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [4.1]
         LiteralExpr [DOUBLE] [4.1]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
index 33c7191..cd0775b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
@@ -18,17 +18,17 @@
   AS Variable [ Name=$o ]
 ]
 Where
-  FunctionCall test.spatial-intersect@2[
+  FunctionCall asterix.spatial-intersect@2[
     FieldAccessor [
       Variable [ Name=$o ]
       Field=rec
     ]
-    FunctionCall test.create-rectangle@2[
-      FunctionCall test.create-point@2[
+    FunctionCall asterix.create-rectangle@2[
+      FunctionCall asterix.create-point@2[
         LiteralExpr [DOUBLE] [4.5]
         LiteralExpr [DOUBLE] [9.0]
       ]
-      FunctionCall test.create-point@2[
+      FunctionCall asterix.create-point@2[
         - LiteralExpr [DOUBLE] [1.0]
         LiteralExpr [DOUBLE] [5.0]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
index 84032c7..b4bf03b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle_accessor/rectangle_accessor.3.ast
@@ -2,19 +2,19 @@
 Query:
 Let Variable [ Name=$rectangle ]
   :=
-  FunctionCall test.create-rectangle@2[
-    FunctionCall test.create-point@2[
+  FunctionCall asterix.create-rectangle@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [9.2]
       LiteralExpr [DOUBLE] [49.0]
     ]
-    FunctionCall test.create-point@2[
+    FunctionCall asterix.create-point@2[
       LiteralExpr [DOUBLE] [77.8]
       LiteralExpr [DOUBLE] [111.1]
     ]
   ]
 Let Variable [ Name=$rectangle_list ]
   :=
-  FunctionCall test.get-points@1[
+  FunctionCall asterix.get-points@1[
     Variable [ Name=$rectangle ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/spatial-area/spatial-area.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/spatial-area/spatial-area.3.ast
index 72d824e..9001e68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/spatial-area/spatial-area.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/spatial-area/spatial-area.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [polygonArea]
     :
-    FunctionCall test.spatial-area@1[
-      FunctionCall test.create-polygon@1[
+    FunctionCall asterix.spatial-area@1[
+      FunctionCall asterix.create-polygon@1[
         OrderedListConstructor [
           LiteralExpr [DOUBLE] [1.0]
           LiteralExpr [DOUBLE] [1.0]
@@ -22,9 +22,9 @@
   (
     LiteralExpr [STRING] [circleArea]
     :
-    FunctionCall test.spatial-area@1[
-      FunctionCall test.create-circle@2[
-        FunctionCall test.create-point@2[
+    FunctionCall asterix.spatial-area@1[
+      FunctionCall asterix.create-circle@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [0.0]
           LiteralExpr [DOUBLE] [0.0]
         ]
@@ -35,13 +35,13 @@
   (
     LiteralExpr [STRING] [rectangleArea]
     :
-    FunctionCall test.spatial-area@1[
-      FunctionCall test.create-rectangle@2[
-        FunctionCall test.create-point@2[
+    FunctionCall asterix.spatial-area@1[
+      FunctionCall asterix.create-rectangle@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [0.0]
           LiteralExpr [DOUBLE] [5.0]
         ]
-        FunctionCall test.create-point@2[
+        FunctionCall asterix.create-point@2[
           LiteralExpr [DOUBLE] [8.0]
           LiteralExpr [DOUBLE] [8.0]
         ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string1/codepoint-to-string1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string1/codepoint-to-string1.3.ast
index fefd6cf..43cd371 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string1/codepoint-to-string1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string1/codepoint-to-string1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [20013]
         LiteralExpr [LONG] [25991]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string2/codepoint-to-string2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string2/codepoint-to-string2.3.ast
index 84548d0..f7b74d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string2/codepoint-to-string2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/codepoint-to-string2/codepoint-to-string2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [f1]
     :
-    FunctionCall test.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
       ]
     ]
@@ -12,7 +12,7 @@
   (
     LiteralExpr [STRING] [f2]
     :
-    FunctionCall test.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [97]
         LiteralExpr [LONG] [98]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_01/concat_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_01/concat_01.3.ast
index e1831a8..80d8355 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_01/concat_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_01/concat_01.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [STRING] [aa]
         LiteralExpr [STRING] [25991]
@@ -16,7 +16,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_02/concat_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_02/concat_02.3.ast
index 00fcae6..8b341dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_02/concat_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_02/concat_02.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [a]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
       ]
@@ -13,7 +13,7 @@
   (
     LiteralExpr [STRING] [b]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [NULL]
         LiteralExpr [STRING] [foo]
@@ -23,7 +23,7 @@
   (
     LiteralExpr [STRING] [c]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [STRING] [foo]
         LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
index 79028fc..57c8a39 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/concat_03/concat_03.3.ast
@@ -39,7 +39,7 @@
     ]
   ]
 SELECT ELEMENT [
-FunctionCall test.string-concat@1[
+FunctionCall asterix.string-concat@1[
   OrderedListConstructor [
     FieldAccessor [
       Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
index e2f0522..8bf8f04 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/constructor/constructor.3.ast
@@ -17,7 +17,7 @@
     Variable [ Name=$c ]
   ]
 SELECT ELEMENT [
-FunctionCall test.string@1[
+FunctionCall asterix.string@1[
   Variable [ Name=$x ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
index 103b8b9..71faef0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/contains_01/contains_01.3.ast
@@ -2,11 +2,11 @@
 Query:
 SELECT ELEMENT [
 OrderedListConstructor [
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     Variable [ Name=$x ]
     LiteralExpr [STRING] [ofo]
   ]
-  FunctionCall test.contains@2[
+  FunctionCall asterix.contains@2[
     Variable [ Name=$y ]
     LiteralExpr [STRING] [ofo]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
index 67695cc..8475722 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.codepoint-to-string@1[
+FunctionCall asterix.codepoint-to-string@1[
   FieldAccessor [
     Variable [ Name=$l ]
     Field=cpt
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr02/cpttostr02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr02/cpttostr02.3.ast
index 2304c31..c6b48ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr02/cpttostr02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr02/cpttostr02.3.ast
@@ -3,7 +3,7 @@
   (
     LiteralExpr [STRING] [c1]
     :
-    FunctionCall null.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [65]
         LiteralExpr [LONG] [66]
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [c2]
     :
-    FunctionCall null.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [97]
         LiteralExpr [LONG] [98]
@@ -71,7 +71,7 @@
   (
     LiteralExpr [STRING] [c3]
     :
-    FunctionCall null.codepoint-to-string@1[
+    FunctionCall asterix.codepoint-to-string@1[
       OrderedListConstructor [
         LiteralExpr [LONG] [33]
         LiteralExpr [LONG] [34]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr04/cpttostr04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr04/cpttostr04.3.ast
index 5da3631..3df90e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr04/cpttostr04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr04/cpttostr04.3.ast
@@ -3,8 +3,8 @@
   (
     LiteralExpr [STRING] [c1]
     :
-    FunctionCall null.codepoint-to-string@1[
-      FunctionCall null.string-to-codepoint@1[
+    FunctionCall asterix.codepoint-to-string@1[
+      FunctionCall asterix.string-to-codepoint@1[
         LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes01/escapes01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes01/escapes01.1.ast
index 0d7c3bc..d5038bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes01/escapes01.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/escapes01/escapes01.1.ast
@@ -1,9 +1,10 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.string-concat@1[
+FunctionCall asterix.string-concat@1[
   OrderedListConstructor [
     LiteralExpr [STRING] [12
-3	4567"8]
+3	4
+567"8]
     LiteralExpr [STRING] ['9]
   ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_01/length_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_01/length_01.3.ast
index 375ab2a..a01e7ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_01/length_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_01/length_01.3.ast
@@ -4,21 +4,21 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [hellow]
     ]
   )
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] []
     ]
   )
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
index e8efac8..59d2029 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/length_02/length_02.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.string-length@1[
+FunctionCall asterix.string-length@1[
   Variable [ Name=$x ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/lowercase/lowercase.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/lowercase/lowercase.3.ast
index 03c38a1..75aea5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/lowercase/lowercase.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/lowercase/lowercase.3.ast
@@ -4,21 +4,21 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [HEllow]
     ]
   )
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] []
     ]
   )
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches02/matches02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches02/matches02.3.ast
index cd2490b..cdfa13f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches02/matches02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches02/matches02.3.ast
@@ -3,7 +3,7 @@
   (
     LiteralExpr [STRING] [c3]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Hello World]
       LiteralExpr [STRING] [Hello World]
     ]
@@ -11,7 +11,7 @@
   (
     LiteralExpr [STRING] [c4]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Asterix for Dummies]
       LiteralExpr [STRING] [Asterix for Dummies]
     ]
@@ -19,9 +19,9 @@
   (
     LiteralExpr [STRING] [c5]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [semistructured data]
-      FunctionCall null.lowercase@1[
+      FunctionCall asterix.lowercase@1[
         LiteralExpr [STRING] [SEMISTRUCTURED DATA]
       ]
     ]
@@ -29,7 +29,7 @@
   (
     LiteralExpr [STRING] [c6]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Mega Living!]
       LiteralExpr [STRING] [Mega]
     ]
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [c7]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Mega Living!]
       LiteralExpr [STRING] [ving!]
     ]
@@ -45,7 +45,7 @@
   (
     LiteralExpr [STRING] [c8]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Mega Living!]
       LiteralExpr [STRING] [ ]
     ]
@@ -53,7 +53,7 @@
   (
     LiteralExpr [STRING] [c9]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Mega Living!]
       LiteralExpr [STRING] [a l]
     ]
@@ -61,7 +61,7 @@
   (
     LiteralExpr [STRING] [c10]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Mega Living!]
       LiteralExpr [STRING] []
     ]
@@ -69,7 +69,7 @@
   (
     LiteralExpr [STRING] [c11]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [ ]
       LiteralExpr [STRING] [ ]
     ]
@@ -77,7 +77,7 @@
   (
     LiteralExpr [STRING] [c12]
     :
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [aaaa]
       LiteralExpr [STRING] [aaaaa]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
index f20037b..d239b54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches03/matches03.3.ast
@@ -3,55 +3,55 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [1234567890]
       LiteralExpr [STRING] [[^a-z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [1234567890]
       LiteralExpr [STRING] [[^a-zA-Z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghABCDEFGH]
       LiteralExpr [STRING] [[^a-zA-Z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[^a-zA-Z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[^A-Z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[^a-z]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[^0-9]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[0-9]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [adefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[a-z&&[^bc]]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]
       LiteralExpr [STRING] [[a-z&&[^bc]]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [bc]
       LiteralExpr [STRING] [[a-z&&[^bc]]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [mnop]
       LiteralExpr [STRING] [[a-z&&[^m-p]]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdmnop]
       LiteralExpr [STRING] [[a-z&&[^m-p]]]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
index af20adf..0210f96 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches04/matches04.3.ast
@@ -3,31 +3,31 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [UCI UCI UCI UCI UCI UCI]
       LiteralExpr [STRING] [[UCI{6}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [UCI UCI UCI UCI UCI UCI]
       LiteralExpr [STRING] [[UCI{3,6}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [UCI UCI UCI UCI UCI UCI]
       LiteralExpr [STRING] [[UCI{7}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [UCI UCI UCI UCI UCI UCI]
       LiteralExpr [STRING] [[UCI{1}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [UCI UCI UCI]
       LiteralExpr [STRING] [[UCI+]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [false]
       LiteralExpr [STRING] [[true|false]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [YX]
       LiteralExpr [STRING] [[XY]]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
index 9a81914..c584f4a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
@@ -9,7 +9,7 @@
   AS Variable [ Name=$l ]
 ]
 Where
-  FunctionCall test.matches@2[
+  FunctionCall asterix.matches@2[
     FieldAccessor [
       Variable [ Name=$l ]
       Field=fname
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
index 416f6d6..87be025 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches06/matches06.3.ast
@@ -3,64 +3,64 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [mnop]
       LiteralExpr [STRING] [.]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefABCDEF]
       LiteralExpr [STRING] [/d]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [12345]
       LiteralExpr [STRING] [\d]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefGHIJK]
       LiteralExpr [STRING] [\D]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [       ]
       LiteralExpr [STRING] [\s]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [       ]
       LiteralExpr [STRING] [\S]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [Welcome to pattern matching!]
       LiteralExpr [STRING] [[a-zA-Z_0-9]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [!@#$%^&*()]
       LiteralExpr [STRING] [[a-zA-Z_0-9]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [!@#$%^&*()]
       LiteralExpr [STRING] [[^\W]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [!@#$%^&*]
       LiteralExpr [STRING] [[^\w]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [0xffff]
       LiteralExpr [STRING] [[\p{XDigit}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [FFFFFFFF]
       LiteralExpr [STRING] [[\p{XDigit}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abcdefgh]
       LiteralExpr [STRING] [[\p{javaLowerCase}]]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [ABCDEF]
       LiteralExpr [STRING] [[\p{javaLowerCase}]]
     ]
-    FunctionCall null.matches@2[
-      FunctionCall null.codepoint-to-string@1[
+    FunctionCall asterix.matches@2[
+      FunctionCall asterix.codepoint-to-string@1[
         OrderedListConstructor [
           LiteralExpr [LONG] [163]
         ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches1/matches1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches1/matches1.3.ast
index 083dc03..eeab1d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches1/matches1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches1/matches1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [bra]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
index f2630ec..4680ab8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches11/matches11.3.ast
@@ -4,23 +4,23 @@
 ]
 FROM [  OrderedListConstructor [
     LiteralExpr [NULL]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [hello]
       LiteralExpr [NULL]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [hello]
       LiteralExpr [STRING] [helllo]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [hello]
       LiteralExpr [STRING] [ ]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [NULL]
       LiteralExpr [STRING] [hello]
     ]
-    FunctionCall null.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [hello]
       LiteralExpr [STRING] [[^a-z]]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches2/matches2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches2/matches2.3.ast
index 5bc68c9..0793e9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches2/matches2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches2/matches2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [^a.*a$]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches21/matches21.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches21/matches21.3.ast
index bca016e..4b29841 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches21/matches21.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches21/matches21.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [STRING] []
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches22/matches22.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches22/matches22.3.ast
index 29cd657..bc1237d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches22/matches22.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches22/matches22.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [STRING] [i]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches23/matches23.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches23/matches23.3.ast
index 2510066..12aea05 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches23/matches23.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches23/matches23.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [STRING] [helloworld]
       LiteralExpr [STRING] [hello world]
       LiteralExpr [STRING] [x]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches3/matches3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches3/matches3.3.ast
index 198de67..ccf4560 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches3/matches3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches3/matches3.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [^bra]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matchesnull/matchesnull.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matchesnull/matchesnull.3.ast
index f719453..c8eb15c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matchesnull/matchesnull.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matchesnull/matchesnull.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] [helloworld]
       LiteralExpr [NULL]
     ]
@@ -12,7 +12,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
     ]
@@ -20,7 +20,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.matches@2[
+    FunctionCall asterix.matches@2[
       LiteralExpr [NULL]
       LiteralExpr [NULL]
     ]
@@ -28,7 +28,7 @@
   (
     LiteralExpr [STRING] [result4]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [STRING] [helloworld]
       LiteralExpr [NULL]
       LiteralExpr [STRING] []
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [result5]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
       LiteralExpr [STRING] [i]
@@ -46,7 +46,7 @@
   (
     LiteralExpr [STRING] [result6]
     :
-    FunctionCall test.matches@3[
+    FunctionCall asterix.matches@3[
       LiteralExpr [NULL]
       LiteralExpr [NULL]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace1/replace1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace1/replace1.3.ast
index 1f92865..63df779 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace1/replace1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace1/replace1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.replace@3[
+    FunctionCall asterix.replace@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [a]
       LiteralExpr [STRING] []
@@ -13,7 +13,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.replace@3[
+    FunctionCall asterix.replace@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [a(.)]
       LiteralExpr [STRING] [a$1$1]
@@ -22,7 +22,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.replace@3[
+    FunctionCall asterix.replace@3[
       LiteralExpr [STRING] [darted]
       LiteralExpr [STRING] [^(.*?)d(.*)$]
       LiteralExpr [STRING] [$1c$2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace2/replace2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace2/replace2.3.ast
index 48dd866..1b63c8a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace2/replace2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace2/replace2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.replace@3[
+    FunctionCall asterix.replace@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [bra]
       LiteralExpr [STRING] [*]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace21/replace21.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace21/replace21.3.ast
index c162e62..6987e20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace21/replace21.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace21/replace21.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [STRING] [kkk]
@@ -14,7 +14,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [STRING] [kkk]
@@ -24,7 +24,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [helloworld]
       LiteralExpr [STRING] [hello world]
       LiteralExpr [STRING] [kkk]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace22/replace22.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace22/replace22.3.ast
index 7469d43..88c6dc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace22/replace22.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace22/replace22.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
@@ -14,7 +14,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [bra]
       LiteralExpr [STRING] [XXX]
@@ -24,7 +24,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [NULL]
       LiteralExpr [STRING] [hello world]
       LiteralExpr [STRING] [XxXx]
@@ -34,7 +34,7 @@
   (
     LiteralExpr [STRING] [result4]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [bra]
       LiteralExpr [STRING] [XXX]
@@ -44,7 +44,7 @@
   (
     LiteralExpr [STRING] [result5]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [NULL]
       LiteralExpr [STRING] [XXX]
@@ -54,7 +54,7 @@
   (
     LiteralExpr [STRING] [result6]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [NULL]
@@ -64,7 +64,7 @@
   (
     LiteralExpr [STRING] [result7]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [Bra]
       LiteralExpr [STRING] []
@@ -74,7 +74,7 @@
   (
     LiteralExpr [STRING] [result8]
     :
-    FunctionCall test.replace@4[
+    FunctionCall asterix.replace@4[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] []
       LiteralExpr [STRING] [XXX]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace3/replace3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace3/replace3.3.ast
index d9f2c0f..dd34592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace3/replace3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/replace3/replace3.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.replace@3[
+    FunctionCall asterix.replace@3[
       LiteralExpr [STRING] [abracadabra]
       LiteralExpr [STRING] [a.*a]
       LiteralExpr [STRING] [*]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
index edb4853..c2a9a7a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [Full Name]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         FieldAccessor [
           Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
index 15439f2..ed56e21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat02/strconcat02.3.ast
@@ -3,26 +3,26 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
-        FunctionCall null.codepoint-to-string@1[
-          FunctionCall null.string-to-codepoint@1[
+        FunctionCall asterix.codepoint-to-string@1[
+          FunctionCall asterix.string-to-codepoint@1[
             LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]
           ]
         ]
-        FunctionCall null.codepoint-to-string@1[
-          FunctionCall null.string-to-codepoint@1[
+        FunctionCall asterix.codepoint-to-string@1[
+          FunctionCall asterix.string-to-codepoint@1[
             LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]
           ]
         ]
-        FunctionCall null.codepoint-to-string@1[
-          FunctionCall null.string-to-codepoint@1[
+        FunctionCall asterix.codepoint-to-string@1[
+          FunctionCall asterix.string-to-codepoint@1[
             LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]
           ]
         ]
       ]
     ]
-    FunctionCall null.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [STRING] [ ]
         LiteralExpr [STRING] [a]
@@ -42,7 +42,7 @@
         LiteralExpr [STRING] [ ]
       ]
     ]
-    FunctionCall null.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [STRING] [This is a test]
         LiteralExpr [STRING] [and all tests must pass]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-concat1/string-concat1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-concat1/string-concat1.3.ast
index 7584bf9..4995015 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-concat1/string-concat1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-concat1/string-concat1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-concat@1[
+    FunctionCall asterix.string-concat@1[
       OrderedListConstructor [
         LiteralExpr [STRING] [aa]
         LiteralExpr [STRING] [25991]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal1/string-equal1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal1/string-equal1.3.ast
index 1377e83..427e08c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal1/string-equal1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal1/string-equal1.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [STRING] [test]
       LiteralExpr [STRING] [tess]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal2/string-equal2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal2/string-equal2.3.ast
index ecb7764..02d45fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal2/string-equal2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal2/string-equal2.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [STRING] [test]
       LiteralExpr [STRING] [test]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal3/string-equal3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal3/string-equal3.3.ast
index 87c8327..041918a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal3/string-equal3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal3/string-equal3.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [STRING] [test11]
       LiteralExpr [STRING] [test]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal4/string-equal4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal4/string-equal4.3.ast
index 5eafec6..c6221c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal4/string-equal4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-equal4/string-equal4.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [STRING] []
       LiteralExpr [STRING] []
     ]
@@ -13,7 +13,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [NULL]
       LiteralExpr [STRING] []
     ]
@@ -21,7 +21,7 @@
   (
     LiteralExpr [STRING] [result4]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
     ]
@@ -29,7 +29,7 @@
   (
     LiteralExpr [STRING] [result5]
     :
-    FunctionCall test.string-equal@2[
+    FunctionCall asterix.string-equal@2[
       LiteralExpr [NULL]
       LiteralExpr [NULL]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-join1/string-join1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-join1/string-join1.3.ast
index e8946c8..330d993 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-join1/string-join1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-join1/string-join1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result0]
     :
-    FunctionCall test.string-join@2[
+    FunctionCall asterix.string-join@2[
       OrderedListConstructor [
         LiteralExpr [STRING] [aa]
         LiteralExpr [STRING] [25991]
@@ -17,7 +17,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-join@2[
+    FunctionCall asterix.string-join@2[
       OrderedListConstructor [
         LiteralExpr [STRING] [aa]
         LiteralExpr [STRING] [25991]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint/string-to-codepoint.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint/string-to-codepoint.3.ast
index 35813f4..6908bf5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint/string-to-codepoint.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint/string-to-codepoint.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-to-codepoint@1[
+    FunctionCall asterix.string-to-codepoint@1[
       LiteralExpr [STRING] [abcd]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint1/string-to-codepoint1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint1/string-to-codepoint1.3.ast
index f702769..e2d9b35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint1/string-to-codepoint1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint1/string-to-codepoint1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-to-codepoint@1[
+    FunctionCall asterix.string-to-codepoint@1[
       LiteralExpr [STRING] []
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint2/string-to-codepoint2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint2/string-to-codepoint2.3.ast
index 28d357a..a57b54ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint2/string-to-codepoint2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/string-to-codepoint2/string-to-codepoint2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.string-to-codepoint@1[
+    FunctionCall asterix.string-to-codepoint@1[
       LiteralExpr [STRING] [欢迎]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
index 540956a..148afbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen02/strlen02.3.ast
@@ -3,22 +3,22 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [abcdefghijklmnopqrstu]
     ]
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTU]
     ]
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [abcdEFGHijklMNOPqrstu]
     ]
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [abcd EFGH ijkl MNOP qrstu]
     ]
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [   Hello World    !!!!....:-)]
     ]
-    FunctionCall null.string-length@1[
+    FunctionCall asterix.string-length@1[
       LiteralExpr [STRING] [~!@#$%^&*()_+{}:?<>/.,';`][\]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
index f25307f..91e17a8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.string-length@1[
+FunctionCall asterix.string-length@1[
   FieldAccessor [
     Variable [ Name=$l ]
     Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt01/strtocpt01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt01/strtocpt01.3.ast
index 1792f53..d2443e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt01/strtocpt01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt01/strtocpt01.3.ast
@@ -1,4 +1,4 @@
 Query:
-FunctionCall null.string-to-codepoint@1[
+FunctionCall asterix.string-to-codepoint@1[
   LiteralExpr [STRING] [ABCDEFGHIJKLMNOPQRSTUVWXYZ-01234567890]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt02/strtocpt02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt02/strtocpt02.3.ast
index b152b24..f424d6d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt02/strtocpt02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt02/strtocpt02.3.ast
@@ -1,4 +1,4 @@
 Query:
-FunctionCall null.string-to-codepoint@1[
+FunctionCall asterix.string-to-codepoint@1[
   LiteralExpr [STRING] ["'-=_+|\,./<>?:;~`]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt03/strtocpt03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt03/strtocpt03.3.ast
index ab3df0f..996499b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt03/strtocpt03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strtocpt03/strtocpt03.3.ast
@@ -1,4 +1,4 @@
 Query:
-FunctionCall null.string-to-codepoint@1[
+FunctionCall asterix.string-to-codepoint@1[
   LiteralExpr [STRING] [!@#$%^&*()]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr01/offset0/substring/substring.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr01/offset0/substring/substring.3.ast
index 31a6a19..5fd0b65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr01/offset0/substring/substring.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr01/offset0/substring/substring.3.ast
@@ -3,7 +3,7 @@
   (
     LiteralExpr [STRING] [str2]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [Hello World]
       LiteralExpr [LONG] [9]
     ]
@@ -11,7 +11,7 @@
   (
     LiteralExpr [STRING] [str4]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [This is a test string]
       LiteralExpr [LONG] [20]
     ]
@@ -19,7 +19,7 @@
   (
     LiteralExpr [STRING] [str6]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [This is a test string]
       LiteralExpr [LONG] [21]
     ]
@@ -27,7 +27,7 @@
   (
     LiteralExpr [STRING] [str8]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [This is a test string]
       LiteralExpr [LONG] [0]
     ]
@@ -35,7 +35,7 @@
   (
     LiteralExpr [STRING] [str10]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [This is a test string]
       - LiteralExpr [LONG] [6]
     ]
@@ -43,8 +43,8 @@
   (
     LiteralExpr [STRING] [str13]
     :
-    FunctionCall null.substring@2[
-      FunctionCall null.string-concat@1[
+    FunctionCall asterix.substring@2[
+      FunctionCall asterix.string-concat@1[
         OrderedListConstructor [
           LiteralExpr [STRING] [This is a test string]
           LiteralExpr [STRING] [This is a another test string]
@@ -56,11 +56,11 @@
   (
     LiteralExpr [STRING] [str14]
     :
-    FunctionCall null.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [UC Irvine]
       OperatorExpr [
         OperatorExpr [
-          FunctionCall null.string-length@1[
+          FunctionCall asterix.string-length@1[
             LiteralExpr [STRING] [UC Irvine]
           ]
           div
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
index 1727ec1..8ae064e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr04/substr04.3.ast
@@ -3,70 +3,70 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [hello world]
       LiteralExpr [LONG] [6]
       LiteralExpr [LONG] [5]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [hello world]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [11]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [hello world]
       LiteralExpr [LONG] [2]
       LiteralExpr [LONG] [9]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [ABCD]
       LiteralExpr [LONG] [2]
       LiteralExpr [LONG] [2]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [ABCD]
       LiteralExpr [LONG] [0]
       LiteralExpr [LONG] [4]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [UC Irvine]
       LiteralExpr [LONG] [3]
       OperatorExpr [
-        FunctionCall null.string-length@1[
+        FunctionCall asterix.string-length@1[
           LiteralExpr [STRING] [UC Irvine]
         ]
         -
         LiteralExpr [LONG] [3]
       ]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [UC Irvine]
       LiteralExpr [LONG] [0]
-      FunctionCall null.string-length@1[
+      FunctionCall asterix.string-length@1[
         LiteralExpr [STRING] [UC Irvine]
       ]
     ]
-    FunctionCall null.substring@3[
-      FunctionCall null.substring@2[
+    FunctionCall asterix.substring@3[
+      FunctionCall asterix.substring@2[
         LiteralExpr [STRING] [UC Irvine]
         LiteralExpr [LONG] [3]
       ]
       LiteralExpr [LONG] [0]
-      FunctionCall null.string-length@1[
+      FunctionCall asterix.string-length@1[
         LiteralExpr [STRING] [Irvine]
       ]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [ABCD]
       - LiteralExpr [LONG] [3]
       LiteralExpr [LONG] [2]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [ABCD]
       - LiteralExpr [LONG] [10]
       LiteralExpr [LONG] [1]
     ]
-    FunctionCall null.substring@3[
+    FunctionCall asterix.substring@3[
       LiteralExpr [STRING] [ABCD]
       LiteralExpr [LONG] [1]
       - LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
index 685a3b4..ee1908e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
@@ -1,14 +1,14 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.substring@3[
+FunctionCall asterix.substring@3[
   FieldAccessor [
     Variable [ Name=$a ]
     Field=name
   ]
   LiteralExpr [LONG] [3]
   OperatorExpr [
-    FunctionCall test.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$a ]
         Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
index f27bf4d..dfa5d77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.substring@2[
+FunctionCall asterix.substring@2[
   FieldAccessor [
     Variable [ Name=$a ]
     Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-1/substring-after-1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-1/substring-after-1.3.ast
index b149866..acf0541 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-1/substring-after-1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-1/substring-after-1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] [El]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-2/substring-after-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-2/substring-after-2.3.ast
index af388f6..5253d46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-2/substring-after-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-2/substring-after-2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] [1]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-3/substring-after-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-3/substring-after-3.3.ast
index f0a9069..5815af2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-3/substring-after-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-3/substring-after-3.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] [HEllow]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-4/substring-after-4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-4/substring-after-4.3.ast
index 7447595..2331e1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-4/substring-after-4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-after-4/substring-after-4.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] []
     ]
@@ -12,7 +12,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [NULL]
     ]
@@ -20,7 +20,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
     ]
@@ -28,7 +28,7 @@
   (
     LiteralExpr [STRING] [result4]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [STRING] []
       LiteralExpr [STRING] []
     ]
@@ -36,7 +36,7 @@
   (
     LiteralExpr [STRING] [result5]
     :
-    FunctionCall test.substring-after@2[
+    FunctionCall asterix.substring-after@2[
       LiteralExpr [NULL]
       LiteralExpr [NULL]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-1/substring-before-1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-1/substring-before-1.3.ast
index de9d58f..ce36cde 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-1/substring-before-1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-1/substring-before-1.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] [ll]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-2/substring-before-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-2/substring-before-2.3.ast
index 76acb5b..8d1184e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-2/substring-before-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-2/substring-before-2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] [HEllow]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-3/substring-before-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-3/substring-before-3.3.ast
index 8025a14..60ff493 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-3/substring-before-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring-before-3/substring-before-3.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [STRING] []
     ]
@@ -12,7 +12,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [NULL]
     ]
@@ -20,7 +20,7 @@
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] []
       LiteralExpr [NULL]
     ]
@@ -28,7 +28,7 @@
   (
     LiteralExpr [STRING] [result4]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [STRING] []
       LiteralExpr [STRING] []
     ]
@@ -36,7 +36,7 @@
   (
     LiteralExpr [STRING] [result5]
     :
-    FunctionCall test.substring-before@2[
+    FunctionCall asterix.substring-before@2[
       LiteralExpr [NULL]
       LiteralExpr [NULL]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-1/offset0/substring/substring.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-1/offset0/substring/substring.3.ast
index f0f9f15..3a2fc01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-1/offset0/substring/substring.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-1/offset0/substring/substring.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [LONG] [1]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-2/substring2-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-2/substring2-2.3.ast
index fe4a308a..504cb01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-2/substring2-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-2/substring2-2.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [LONG] [0]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-3/substring2-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-3/substring2-3.3.ast
index 358d135..4a5dbf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-3/substring2-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-3/substring2-3.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [HEllow]
       LiteralExpr [LONG] [9]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-4/substring2-4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-4/substring2-4.3.ast
index eb5857e..3514635 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-4/substring2-4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring2-4/substring2-4.3.ast
@@ -4,7 +4,7 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [HEllow]
       - LiteralExpr [LONG] [3]
     ]
@@ -12,7 +12,7 @@
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.substring@2[
+    FunctionCall asterix.substring@2[
       LiteralExpr [STRING] [HEllow]
       - LiteralExpr [LONG] [7]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
index d24c5b8..85330a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substring_01/substring_01.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.substring@3[
+FunctionCall asterix.substring@3[
   Variable [ Name=$x ]
   LiteralExpr [LONG] [1]
   LiteralExpr [LONG] [3]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
index f5e983d..643c582 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase02/toLowerCase02.3.ast
@@ -3,43 +3,43 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [a   b  c  d  e  f  g]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [abcdefghij KLMNOP qrstu VWXYZ]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [abcdefghijklmnopqrstuvwxyz]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [this is a test string]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [smaller string]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [ABCD]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [AbCdEfGhIjKlMnOpQrStUvWxYz]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [abcdefghijkABCDEFGHIJK]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [HIJKLMNOPQRhijklmnopqr]
     ]
-    FunctionCall null.lowercase@1[
-      FunctionCall null.substring@2[
+    FunctionCall asterix.lowercase@1[
+      FunctionCall asterix.substring@2[
         LiteralExpr [STRING] [ABCDEFghIJKLMnopQRSTuvwxYZ01234]
         LiteralExpr [LONG] [0]
       ]
     ]
-    FunctionCall null.lowercase@1[
+    FunctionCall asterix.lowercase@1[
       LiteralExpr [STRING] [A33B2CD1EF78GHijk123LMNopqrstUVW3x2y01035Z]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
index a9aed30..564551b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
@@ -1,7 +1,7 @@
 DataverseUse test
 Query:
 SELECT ELEMENT [
-FunctionCall test.lowercase@1[
+FunctionCall asterix.lowercase@1[
   FieldAccessor [
     Variable [ Name=$l ]
     Field=name
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
index 99a277a..0701467 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase04/toLowerCase04.3.ast
@@ -3,8 +3,8 @@
 Variable [ Name=$a ]
 ]
 FROM [  OrderedListConstructor [
-    FunctionCall null.lowercase@1[
-      FunctionCall null.codepoint-to-string@1[
+    FunctionCall asterix.lowercase@1[
+      FunctionCall asterix.codepoint-to-string@1[
         OrderedListConstructor [
           LiteralExpr [LONG] [65]
           LiteralExpr [LONG] [66]
@@ -35,8 +35,8 @@
         ]
       ]
     ]
-    FunctionCall null.lowercase@1[
-      FunctionCall null.string-concat@1[
+    FunctionCall asterix.lowercase@1[
+      FunctionCall asterix.string-concat@1[
         OrderedListConstructor [
           LiteralExpr [STRING] [ABCDEFGHIJKLMNOP]
           LiteralExpr [STRING] [QRSTUVWXYZ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/uppercase/uppercase.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/uppercase/uppercase.3.ast
index a9c5578..de31602 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/uppercase/uppercase.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/uppercase/uppercase.3.ast
@@ -4,21 +4,21 @@
   (
     LiteralExpr [STRING] [result1]
     :
-    FunctionCall test.uppercase@1[
+    FunctionCall asterix.uppercase@1[
       LiteralExpr [STRING] [Hellow]
     ]
   )
   (
     LiteralExpr [STRING] [result2]
     :
-    FunctionCall test.uppercase@1[
+    FunctionCall asterix.uppercase@1[
       LiteralExpr [STRING] []
     ]
   )
   (
     LiteralExpr [STRING] [result3]
     :
-    FunctionCall test.uppercase@1[
+    FunctionCall asterix.uppercase@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
index 353dcf8..5b5d3ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/01/01.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
index 4099fe1..53ed8cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/02/02.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
index e09633a..65796a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/03/03.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
index 20a4908..fc441b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/05/05.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [STRING] [a]
       LiteralExpr [STRING] [b]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
index c2bff51..844a405 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/06/06.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
index 277e478..d602534 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/subset-collection/07/07.3.ast
@@ -4,7 +4,7 @@
 SELECT ELEMENT [
 Variable [ Name=$l ]
 ]
-FROM [  FunctionCall test.subset-collection@3[
+FROM [  FunctionCall asterix.subset-collection@3[
     OrderedListConstructor [
       LiteralExpr [LONG] [1]
       LiteralExpr [LONG] [2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors/accessors.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors/accessors.3.ast
index 05dcf98..5a452be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors/accessors.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors/accessors.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [year1]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [year2]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [year3]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1987-11-19]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [year4]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [09280329]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [year5]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -49,8 +49,8 @@
   (
     LiteralExpr [STRING] [year6]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.string@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.string@1[
         LiteralExpr [STRING] [-0003-01-09T23:12:12.39-07:00]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [year7]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -67,8 +67,8 @@
   (
     LiteralExpr [STRING] [year8]
     :
-    FunctionCall test.get-year@1[
-      FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.get-year@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P8Y12M]
       ]
     ]
@@ -76,15 +76,15 @@
   (
     LiteralExpr [STRING] [year-null]
     :
-    FunctionCall test.get-year@1[
+    FunctionCall asterix.get-year@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [month1]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
     ]
@@ -92,8 +92,8 @@
   (
     LiteralExpr [STRING] [month2]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -101,8 +101,8 @@
   (
     LiteralExpr [STRING] [month3]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1987-11-19]
       ]
     ]
@@ -110,8 +110,8 @@
   (
     LiteralExpr [STRING] [month4]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [09280329]
       ]
     ]
@@ -119,8 +119,8 @@
   (
     LiteralExpr [STRING] [month5]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -128,8 +128,8 @@
   (
     LiteralExpr [STRING] [month6]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -137,8 +137,8 @@
   (
     LiteralExpr [STRING] [month7]
     :
-    FunctionCall test.get-month@1[
-      FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.get-month@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P8Y12M]
       ]
     ]
@@ -146,15 +146,15 @@
   (
     LiteralExpr [STRING] [month-null]
     :
-    FunctionCall test.get-month@1[
+    FunctionCall asterix.get-month@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [day1]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
     ]
@@ -162,8 +162,8 @@
   (
     LiteralExpr [STRING] [day2]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -171,8 +171,8 @@
   (
     LiteralExpr [STRING] [day3]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1987-11-19]
       ]
     ]
@@ -180,8 +180,8 @@
   (
     LiteralExpr [STRING] [day4]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [09280329]
       ]
     ]
@@ -189,8 +189,8 @@
   (
     LiteralExpr [STRING] [day5]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -198,8 +198,8 @@
   (
     LiteralExpr [STRING] [day6]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -207,8 +207,8 @@
   (
     LiteralExpr [STRING] [day7]
     :
-    FunctionCall test.get-day@1[
-      FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.get-day@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P32DT49H743M3948.94S]
       ]
     ]
@@ -216,15 +216,15 @@
   (
     LiteralExpr [STRING] [day-null]
     :
-    FunctionCall test.get-day@1[
+    FunctionCall asterix.get-day@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [hour1]
     :
-    FunctionCall test.get-hour@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-hour@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -232,8 +232,8 @@
   (
     LiteralExpr [STRING] [hour2]
     :
-    FunctionCall test.get-hour@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-hour@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -241,8 +241,8 @@
   (
     LiteralExpr [STRING] [hour3]
     :
-    FunctionCall test.get-hour@1[
-      FunctionCall test.time@1[
+    FunctionCall asterix.get-hour@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:23:34.930+07:00]
       ]
     ]
@@ -250,8 +250,8 @@
   (
     LiteralExpr [STRING] [hour4]
     :
-    FunctionCall test.get-hour@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-hour@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -259,8 +259,8 @@
   (
     LiteralExpr [STRING] [hour5]
     :
-    FunctionCall test.get-hour@1[
-      FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.get-hour@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P32DT49H743M3948.94S]
       ]
     ]
@@ -268,15 +268,15 @@
   (
     LiteralExpr [STRING] [hour-null]
     :
-    FunctionCall test.get-hour@1[
+    FunctionCall asterix.get-hour@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [min1]
     :
-    FunctionCall test.get-minute@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-minute@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -284,8 +284,8 @@
   (
     LiteralExpr [STRING] [min2]
     :
-    FunctionCall test.get-minute@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-minute@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -293,8 +293,8 @@
   (
     LiteralExpr [STRING] [min3]
     :
-    FunctionCall test.get-minute@1[
-      FunctionCall test.time@1[
+    FunctionCall asterix.get-minute@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:23:34.930+07:00]
       ]
     ]
@@ -302,8 +302,8 @@
   (
     LiteralExpr [STRING] [min4]
     :
-    FunctionCall test.get-minute@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-minute@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -311,8 +311,8 @@
   (
     LiteralExpr [STRING] [min5]
     :
-    FunctionCall test.get-minute@1[
-      FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.get-minute@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P32DT49H743M3948.94S]
       ]
     ]
@@ -320,15 +320,15 @@
   (
     LiteralExpr [STRING] [min-null]
     :
-    FunctionCall test.get-minute@1[
+    FunctionCall asterix.get-minute@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [second1]
     :
-    FunctionCall test.get-second@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-second@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -336,8 +336,8 @@
   (
     LiteralExpr [STRING] [second2]
     :
-    FunctionCall test.get-second@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-second@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -345,8 +345,8 @@
   (
     LiteralExpr [STRING] [second3]
     :
-    FunctionCall test.get-second@1[
-      FunctionCall test.time@1[
+    FunctionCall asterix.get-second@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:23:34.930+07:00]
       ]
     ]
@@ -354,8 +354,8 @@
   (
     LiteralExpr [STRING] [second4]
     :
-    FunctionCall test.get-second@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-second@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -363,8 +363,8 @@
   (
     LiteralExpr [STRING] [second5]
     :
-    FunctionCall test.get-second@1[
-      FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.get-second@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P32DT49H743M3948.94S]
       ]
     ]
@@ -372,15 +372,15 @@
   (
     LiteralExpr [STRING] [second-null]
     :
-    FunctionCall test.get-second@1[
+    FunctionCall asterix.get-second@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [ms1]
     :
-    FunctionCall test.get-millisecond@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-millisecond@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
     ]
@@ -388,8 +388,8 @@
   (
     LiteralExpr [STRING] [ms2]
     :
-    FunctionCall test.get-millisecond@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-millisecond@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [19371229T20030628]
       ]
     ]
@@ -397,8 +397,8 @@
   (
     LiteralExpr [STRING] [ms3]
     :
-    FunctionCall test.get-millisecond@1[
-      FunctionCall test.time@1[
+    FunctionCall asterix.get-millisecond@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:23:34.930+07:00]
       ]
     ]
@@ -406,8 +406,8 @@
   (
     LiteralExpr [STRING] [ms4]
     :
-    FunctionCall test.get-millisecond@1[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.get-millisecond@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P3Y73M632DT49H743M3948.94S]
       ]
     ]
@@ -415,8 +415,8 @@
   (
     LiteralExpr [STRING] [ms5]
     :
-    FunctionCall test.get-millisecond@1[
-      FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.get-millisecond@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [P32DT49H743M3948.94S]
       ]
     ]
@@ -424,7 +424,7 @@
   (
     LiteralExpr [STRING] [ms-null]
     :
-    FunctionCall test.get-millisecond@1[
+    FunctionCall asterix.get-millisecond@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
index d915dd8..b19c8e8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval/accessors_interval.3.ast
@@ -4,12 +4,12 @@
   (
     LiteralExpr [STRING] [start1]
     :
-    FunctionCall test.get-interval-start@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.date@1[
+    FunctionCall asterix.get-interval-start@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2010-10-30]
         ]
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-04-01]
         ]
       ]
@@ -18,12 +18,12 @@
   (
     LiteralExpr [STRING] [end1]
     :
-    FunctionCall test.get-interval-end@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.date@1[
+    FunctionCall asterix.get-interval-end@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2010-10-30]
         ]
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-04-01]
         ]
       ]
@@ -32,12 +32,12 @@
   (
     LiteralExpr [STRING] [start2]
     :
-    FunctionCall test.get-interval-start@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.time@1[
+    FunctionCall asterix.get-interval-start@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [08:09:10.234Z]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [203040567+0800]
         ]
       ]
@@ -46,12 +46,12 @@
   (
     LiteralExpr [STRING] [end2]
     :
-    FunctionCall test.get-interval-end@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.time@1[
+    FunctionCall asterix.get-interval-end@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [08:09:10.234Z]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [203040567+0800]
         ]
       ]
@@ -60,16 +60,16 @@
   (
     LiteralExpr [STRING] [start3]
     :
-    FunctionCall test.get-interval-start@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.datetime@1[
+    FunctionCall asterix.get-interval-start@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2009-09-01T00:00:00.000+08:00]
         ]
-        FunctionCall test.datetime-from-date-time@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.datetime-from-date-time@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [2013-04-04]
           ]
-          FunctionCall test.time@1[
+          FunctionCall asterix.time@1[
             LiteralExpr [STRING] [00:00:00.000+08:00]
           ]
         ]
@@ -79,16 +79,16 @@
   (
     LiteralExpr [STRING] [end3]
     :
-    FunctionCall test.get-interval-end@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.datetime@1[
+    FunctionCall asterix.get-interval-end@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2009-09-01T00:00:00.000+08:00]
         ]
-        FunctionCall test.datetime-from-date-time@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.datetime-from-date-time@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [2013-04-04]
           ]
-          FunctionCall test.time@1[
+          FunctionCall asterix.time@1[
             LiteralExpr [STRING] [00:00:00.000+08:00]
           ]
         ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval_null/accessors_interval_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval_null/accessors_interval_null.3.ast
index 133a0f7..d1dcace 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval_null/accessors_interval_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/accessors_interval_null/accessors_interval_null.3.ast
@@ -5,14 +5,14 @@
   (
     LiteralExpr [STRING] [start-null-interval]
     :
-    FunctionCall test.get-interval-start@1[
+    FunctionCall asterix.get-interval-start@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [end-null-interval]
     :
-    FunctionCall test.get-interval-end@1[
+    FunctionCall asterix.get-interval-end@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/adjust_timezone/adjust_timezone.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/adjust_timezone/adjust_timezone.3.ast
index 9906449..93175fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/adjust_timezone/adjust_timezone.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/adjust_timezone/adjust_timezone.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [time]
     :
-    FunctionCall test.adjust-time-for-timezone@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.adjust-time-for-timezone@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [20:15:10.327]
       ]
       LiteralExpr [STRING] [+0800]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [datetime]
     :
-    FunctionCall test.adjust-datetime-for-timezone@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.adjust-datetime-for-timezone@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2010-10-23T01:12:13.329Z]
       ]
       LiteralExpr [STRING] [-0615]
@@ -24,7 +24,7 @@
   (
     LiteralExpr [STRING] [null1]
     :
-    FunctionCall test.adjust-time-for-timezone@2[
+    FunctionCall asterix.adjust-time-for-timezone@2[
       LiteralExpr [NULL]
       LiteralExpr [STRING] [+0800]
     ]
@@ -32,8 +32,8 @@
   (
     LiteralExpr [STRING] [null2]
     :
-    FunctionCall test.adjust-time-for-timezone@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.adjust-time-for-timezone@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [20:15:10.327]
       ]
       LiteralExpr [NULL]
@@ -42,7 +42,7 @@
   (
     LiteralExpr [STRING] [null3]
     :
-    FunctionCall test.adjust-datetime-for-timezone@2[
+    FunctionCall asterix.adjust-datetime-for-timezone@2[
       LiteralExpr [NULL]
       LiteralExpr [STRING] [-0800]
     ]
@@ -50,8 +50,8 @@
   (
     LiteralExpr [STRING] [null4]
     :
-    FunctionCall test.adjust-datetime-for-timezone@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.adjust-datetime-for-timezone@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2010-10-23T01:12:13.329Z]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/calendar_duration/calendar_duration.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/calendar_duration/calendar_duration.3.ast
index a36868f..159146f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/calendar_duration/calendar_duration.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/calendar_duration/calendar_duration.3.ast
@@ -5,11 +5,11 @@
   (
     LiteralExpr [STRING] [cduration1]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P7382DT39283M3921.329S]
       ]
     ]
@@ -19,25 +19,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P7382DT39283M3921.329S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.calendar-duration-from-datetime@2[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.calendar-duration-from-datetime@2[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1987-11-19T23:49:23.938]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [P7382DT39283M3921.329S]
           ]
         ]
@@ -47,11 +47,11 @@
   (
     LiteralExpr [STRING] [cduration2]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-PT63H398212M3219.328S]
       ]
     ]
@@ -61,25 +61,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [-PT63H398212M3219.328S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.calendar-duration-from-datetime@2[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.calendar-duration-from-datetime@2[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1987-11-19T23:49:23.938]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [-PT63H398212M3219.328S]
           ]
         ]
@@ -89,11 +89,11 @@
   (
     LiteralExpr [STRING] [cduration3]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1Y90M]
       ]
     ]
@@ -103,25 +103,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P1Y90M]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.calendar-duration-from-datetime@2[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.calendar-duration-from-datetime@2[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1987-11-19T23:49:23.938]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [P1Y90M]
           ]
         ]
@@ -131,11 +131,11 @@
   (
     LiteralExpr [STRING] [cduration4]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
       ]
     ]
@@ -145,25 +145,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1987-11-19T23:49:23.938]
         ]
         +
-        FunctionCall test.calendar-duration-from-datetime@2[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.calendar-duration-from-datetime@2[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1987-11-19T23:49:23.938]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
           ]
         ]
@@ -173,11 +173,11 @@
   (
     LiteralExpr [STRING] [cduration5]
     :
-    FunctionCall test.calendar-duration-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.calendar-duration-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1328-10-23]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P7382DT39283M3921.329S]
       ]
     ]
@@ -187,25 +187,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P7382DT39283M3921.329S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.calendar-duration-from-date@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.calendar-duration-from-date@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [-1328-10-23]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [P7382DT39283M3921.329S]
           ]
         ]
@@ -215,11 +215,11 @@
   (
     LiteralExpr [STRING] [cduration6]
     :
-    FunctionCall test.calendar-duration-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.calendar-duration-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1328-10-23]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-PT63H398212M3219.328S]
       ]
     ]
@@ -229,25 +229,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [-PT63H398212M3219.328S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.calendar-duration-from-date@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.calendar-duration-from-date@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [-1328-10-23]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [-PT63H398212M3219.328S]
           ]
         ]
@@ -257,11 +257,11 @@
   (
     LiteralExpr [STRING] [cduration7]
     :
-    FunctionCall test.calendar-duration-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.calendar-duration-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1328-10-23]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1Y90M]
       ]
     ]
@@ -271,25 +271,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P1Y90M]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.calendar-duration-from-date@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.calendar-duration-from-date@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [-1328-10-23]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [P1Y90M]
           ]
         ]
@@ -299,11 +299,11 @@
   (
     LiteralExpr [STRING] [cduration8]
     :
-    FunctionCall test.calendar-duration-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.calendar-duration-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1328-10-23]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
       ]
     ]
@@ -313,25 +313,25 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
         ]
       ]
       =
       OperatorExpr [
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [-1328-10-23]
         ]
         +
-        FunctionCall test.calendar-duration-from-date@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.calendar-duration-from-date@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [-1328-10-23]
           ]
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [-P3Y89M4089DT47382.983S]
           ]
         ]
@@ -341,9 +341,9 @@
   (
     LiteralExpr [STRING] [cduration-null-1]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
       LiteralExpr [NULL]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P7382DT39283M3921.329S]
       ]
     ]
@@ -351,8 +351,8 @@
   (
     LiteralExpr [STRING] [cduration-null-2]
     :
-    FunctionCall test.calendar-duration-from-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.calendar-duration-from-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1987-11-19T23:49:23.938]
       ]
       LiteralExpr [NULL]
@@ -361,9 +361,9 @@
   (
     LiteralExpr [STRING] [cduration-null-3]
     :
-    FunctionCall test.calendar-duration-from-date@2[
+    FunctionCall asterix.calendar-duration-from-date@2[
       LiteralExpr [NULL]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P7382DT39283M3921.329S]
       ]
     ]
@@ -371,8 +371,8 @@
   (
     LiteralExpr [STRING] [cduration-null-4]
     :
-    FunctionCall test.calendar-duration-from-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.calendar-duration-from-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1328-10-23]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/date_functions/date_functions.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/date_functions/date_functions.3.ast
index 63dc7a6..674377e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/date_functions/date_functions.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/date_functions/date_functions.3.ast
@@ -5,15 +5,15 @@
   (
     LiteralExpr [STRING] [date1]
     :
-    FunctionCall test.date-from-unix-time-in-days@1[
+    FunctionCall asterix.date-from-unix-time-in-days@1[
       LiteralExpr [LONG] [15600]
     ]
   )
   (
     LiteralExpr [STRING] [date2]
     :
-    FunctionCall test.get-date-from-datetime@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-date-from-datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
       ]
     ]
@@ -21,8 +21,8 @@
   (
     LiteralExpr [STRING] [date3]
     :
-    FunctionCall test.get-date-from-datetime@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-date-from-datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-10-11T02:30:23+03:00]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [date4]
     :
     OperatorExpr [
-      FunctionCall test.date-from-unix-time-in-days@1[
+      FunctionCall asterix.date-from-unix-time-in-days@1[
         LiteralExpr [LONG] [15600]
       ]
       +
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P2Y1M90DT30H]
       ]
     ]
@@ -44,13 +44,13 @@
     LiteralExpr [STRING] [date5]
     :
     OperatorExpr [
-      FunctionCall test.get-date-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-date-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
       +
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P300Y900MT360000M]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [unix1]
     :
-    FunctionCall test.unix-time-from-date-in-days@1[
-      FunctionCall test.date-from-unix-time-in-days@1[
+    FunctionCall asterix.unix-time-from-date-in-days@1[
+      FunctionCall asterix.date-from-unix-time-in-days@1[
         LiteralExpr [LONG] [15600]
       ]
     ]
@@ -69,19 +69,19 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.get-date-from-datetime@1[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.get-date-from-datetime@1[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
           ]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P300Y900MT360000M]
         ]
       ]
       -
-      FunctionCall test.get-date-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-date-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
@@ -92,16 +92,16 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.date-from-unix-time-in-days@1[
+        FunctionCall asterix.date-from-unix-time-in-days@1[
           LiteralExpr [LONG] [15600]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [-P2Y1M90DT30H]
         ]
       ]
       -
-      FunctionCall test.date-from-unix-time-in-days@1[
+      FunctionCall asterix.date-from-unix-time-in-days@1[
         LiteralExpr [LONG] [15600]
       ]
     ]
@@ -110,32 +110,32 @@
     LiteralExpr [STRING] [c1]
     :
     OperatorExpr [
-      FunctionCall test.date-from-unix-time-in-days@1[
+      FunctionCall asterix.date-from-unix-time-in-days@1[
         LiteralExpr [LONG] [15600]
       ]
       =
       OperatorExpr [
         OperatorExpr [
-          FunctionCall test.date-from-unix-time-in-days@1[
+          FunctionCall asterix.date-from-unix-time-in-days@1[
             LiteralExpr [LONG] [15600]
           ]
           +
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [-P2Y1M90DT30H]
           ]
         ]
         +
         OperatorExpr [
-          FunctionCall test.date-from-unix-time-in-days@1[
+          FunctionCall asterix.date-from-unix-time-in-days@1[
             LiteralExpr [LONG] [15600]
           ]
           -
           OperatorExpr [
-            FunctionCall test.date-from-unix-time-in-days@1[
+            FunctionCall asterix.date-from-unix-time-in-days@1[
               LiteralExpr [LONG] [15600]
             ]
             +
-            FunctionCall test.duration@1[
+            FunctionCall asterix.duration@1[
               LiteralExpr [STRING] [-P2Y1M90DT30H]
             ]
           ]
@@ -147,40 +147,40 @@
     LiteralExpr [STRING] [c2]
     :
     OperatorExpr [
-      FunctionCall test.get-date-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-date-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
       =
       OperatorExpr [
         OperatorExpr [
-          FunctionCall test.get-date-from-datetime@1[
-            FunctionCall test.datetime@1[
+          FunctionCall asterix.get-date-from-datetime@1[
+            FunctionCall asterix.datetime@1[
               LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
             ]
           ]
           +
-          FunctionCall test.duration@1[
+          FunctionCall asterix.duration@1[
             LiteralExpr [STRING] [P300Y900MT360000M]
           ]
         ]
         +
         OperatorExpr [
-          FunctionCall test.get-date-from-datetime@1[
-            FunctionCall test.datetime@1[
+          FunctionCall asterix.get-date-from-datetime@1[
+            FunctionCall asterix.datetime@1[
               LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
             ]
           ]
           -
           OperatorExpr [
-            FunctionCall test.get-date-from-datetime@1[
-              FunctionCall test.datetime@1[
+            FunctionCall asterix.get-date-from-datetime@1[
+              FunctionCall asterix.datetime@1[
                 LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
               ]
             ]
             +
-            FunctionCall test.duration@1[
+            FunctionCall asterix.duration@1[
               LiteralExpr [STRING] [P300Y900MT360000M]
             ]
           ]
@@ -191,21 +191,21 @@
   (
     LiteralExpr [STRING] [null1]
     :
-    FunctionCall test.date-from-unix-time-in-days@1[
+    FunctionCall asterix.date-from-unix-time-in-days@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [nullunix1]
     :
-    FunctionCall test.unix-time-from-date-in-days@1[
+    FunctionCall asterix.unix-time-from-date-in-days@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [null2]
     :
-    FunctionCall test.get-date-from-datetime@1[
+    FunctionCall asterix.get-date-from-datetime@1[
       LiteralExpr [NULL]
     ]
   )
@@ -215,7 +215,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       +
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P2Y1M90DT30H]
       ]
     ]
@@ -224,7 +224,7 @@
     LiteralExpr [STRING] [null4]
     :
     OperatorExpr [
-      FunctionCall test.date-from-unix-time-in-days@1[
+      FunctionCall asterix.date-from-unix-time-in-days@1[
         LiteralExpr [LONG] [15600]
       ]
       +
@@ -237,8 +237,8 @@
     OperatorExpr [
       LiteralExpr [NULL]
       -
-      FunctionCall test.get-date-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-date-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
@@ -249,13 +249,13 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.get-date-from-datetime@1[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.get-date-from-datetime@1[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
           ]
         ]
         +
-        FunctionCall test.duration@1[
+        FunctionCall asterix.duration@1[
           LiteralExpr [STRING] [P300Y900MT360000M]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/datetime_functions/datetime_functions.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/datetime_functions/datetime_functions.3.ast
index c9d1ded..2a45a26 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/datetime_functions/datetime_functions.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/datetime_functions/datetime_functions.3.ast
@@ -5,25 +5,25 @@
   (
     LiteralExpr [STRING] [datetime1]
     :
-    FunctionCall test.datetime-from-unix-time-in-ms@1[
+    FunctionCall asterix.datetime-from-unix-time-in-ms@1[
       LiteralExpr [LONG] [956007429]
     ]
   )
   (
     LiteralExpr [STRING] [datetime1secs]
     :
-    FunctionCall test.datetime-from-unix-time-in-secs@1[
+    FunctionCall asterix.datetime-from-unix-time-in-secs@1[
       LiteralExpr [LONG] [1356048000]
     ]
   )
   (
     LiteralExpr [STRING] [datetime2]
     :
-    FunctionCall test.datetime-from-date-time@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.datetime-from-date-time@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [1327-12-02]
       ]
-      FunctionCall test.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [15:35:49.938-0800]
       ]
     ]
@@ -32,21 +32,21 @@
     LiteralExpr [STRING] [datetime3]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
       +
       OperatorExpr [
-        FunctionCall test.datetime-from-date-time@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.datetime-from-date-time@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [1327-12-02]
           ]
-          FunctionCall test.time@1[
+          FunctionCall asterix.time@1[
             LiteralExpr [STRING] [15:35:49.938-0800]
           ]
         ]
         -
-        FunctionCall test.datetime-from-unix-time-in-ms@1[
+        FunctionCall asterix.datetime-from-unix-time-in-ms@1[
           LiteralExpr [LONG] [956007429]
         ]
       ]
@@ -56,11 +56,11 @@
     LiteralExpr [STRING] [datetime4]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
       -
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1MT1S]
       ]
     ]
@@ -69,11 +69,11 @@
     LiteralExpr [STRING] [datetime5]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
       +
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1MT1S]
       ]
     ]
@@ -81,8 +81,8 @@
   (
     LiteralExpr [STRING] [unixms1]
     :
-    FunctionCall test.unix-time-from-datetime-in-ms@1[
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+    FunctionCall asterix.unix-time-from-datetime-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
     ]
@@ -90,8 +90,8 @@
   (
     LiteralExpr [STRING] [unixsecs1]
     :
-    FunctionCall test.unix-time-from-datetime-in-secs@1[
-      FunctionCall test.datetime-from-unix-time-in-secs@1[
+    FunctionCall asterix.unix-time-from-datetime-in-secs@1[
+      FunctionCall asterix.datetime-from-unix-time-in-secs@1[
         LiteralExpr [LONG] [1356048000]
       ]
     ]
@@ -100,16 +100,16 @@
     LiteralExpr [STRING] [duration1]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-date-time@2[
-        FunctionCall test.date@1[
+      FunctionCall asterix.datetime-from-date-time@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1327-12-02]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [15:35:49.938-0800]
         ]
       ]
       -
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
     ]
@@ -118,32 +118,32 @@
     LiteralExpr [STRING] [c1]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
       =
       OperatorExpr [
         OperatorExpr [
-          FunctionCall test.datetime-from-unix-time-in-ms@1[
+          FunctionCall asterix.datetime-from-unix-time-in-ms@1[
             LiteralExpr [LONG] [956007429]
           ]
           -
           OperatorExpr [
-            FunctionCall test.datetime-from-unix-time-in-ms@1[
+            FunctionCall asterix.datetime-from-unix-time-in-ms@1[
               LiteralExpr [LONG] [956007429]
             ]
             +
             OperatorExpr [
-              FunctionCall test.datetime-from-date-time@2[
-                FunctionCall test.date@1[
+              FunctionCall asterix.datetime-from-date-time@2[
+                FunctionCall asterix.date@1[
                   LiteralExpr [STRING] [1327-12-02]
                 ]
-                FunctionCall test.time@1[
+                FunctionCall asterix.time@1[
                   LiteralExpr [STRING] [15:35:49.938-0800]
                 ]
               ]
               -
-              FunctionCall test.datetime-from-unix-time-in-ms@1[
+              FunctionCall asterix.datetime-from-unix-time-in-ms@1[
                 LiteralExpr [LONG] [956007429]
               ]
             ]
@@ -151,21 +151,21 @@
         ]
         +
         OperatorExpr [
-          FunctionCall test.datetime-from-unix-time-in-ms@1[
+          FunctionCall asterix.datetime-from-unix-time-in-ms@1[
             LiteralExpr [LONG] [956007429]
           ]
           +
           OperatorExpr [
-            FunctionCall test.datetime-from-date-time@2[
-              FunctionCall test.date@1[
+            FunctionCall asterix.datetime-from-date-time@2[
+              FunctionCall asterix.date@1[
                 LiteralExpr [STRING] [1327-12-02]
               ]
-              FunctionCall test.time@1[
+              FunctionCall asterix.time@1[
                 LiteralExpr [STRING] [15:35:49.938-0800]
               ]
             ]
             -
-            FunctionCall test.datetime-from-unix-time-in-ms@1[
+            FunctionCall asterix.datetime-from-unix-time-in-ms@1[
               LiteralExpr [LONG] [956007429]
             ]
           ]
@@ -176,37 +176,37 @@
   (
     LiteralExpr [STRING] [null1]
     :
-    FunctionCall test.datetime-from-unix-time-in-ms@1[
+    FunctionCall asterix.datetime-from-unix-time-in-ms@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [null1secs]
     :
-    FunctionCall test.datetime-from-unix-time-in-secs@1[
+    FunctionCall asterix.datetime-from-unix-time-in-secs@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [nullunixms1]
     :
-    FunctionCall test.unix-time-from-datetime-in-ms@1[
+    FunctionCall asterix.unix-time-from-datetime-in-ms@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [nullunixsecs1]
     :
-    FunctionCall test.unix-time-from-datetime-in-secs@1[
+    FunctionCall asterix.unix-time-from-datetime-in-secs@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [null2]
     :
-    FunctionCall test.datetime-from-date-time@2[
+    FunctionCall asterix.datetime-from-date-time@2[
       LiteralExpr [NULL]
-      FunctionCall test.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [15:35:49.938-0800]
       ]
     ]
@@ -214,8 +214,8 @@
   (
     LiteralExpr [STRING] [null3]
     :
-    FunctionCall test.datetime-from-date-time@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.datetime-from-date-time@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [1327-12-02]
       ]
       LiteralExpr [NULL]
@@ -227,7 +227,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       -
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
     ]
@@ -236,11 +236,11 @@
     LiteralExpr [STRING] [null5]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-date-time@2[
-        FunctionCall test.date@1[
+      FunctionCall asterix.datetime-from-date-time@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1327-12-02]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [15:35:49.938-0800]
         ]
       ]
@@ -255,16 +255,16 @@
       LiteralExpr [NULL]
       +
       OperatorExpr [
-        FunctionCall test.datetime-from-date-time@2[
-          FunctionCall test.date@1[
+        FunctionCall asterix.datetime-from-date-time@2[
+          FunctionCall asterix.date@1[
             LiteralExpr [STRING] [1327-12-02]
           ]
-          FunctionCall test.time@1[
+          FunctionCall asterix.time@1[
             LiteralExpr [STRING] [15:35:49.938-0800]
           ]
         ]
         -
-        FunctionCall test.datetime-from-unix-time-in-ms@1[
+        FunctionCall asterix.datetime-from-unix-time-in-ms@1[
           LiteralExpr [LONG] [956007429]
         ]
       ]
@@ -274,7 +274,7 @@
     LiteralExpr [STRING] [null7]
     :
     OperatorExpr [
-      FunctionCall test.datetime-from-unix-time-in-ms@1[
+      FunctionCall asterix.datetime-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [956007429]
       ]
       +
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/day_of_week_01/day_of_week_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/day_of_week_01/day_of_week_01.3.ast
index f549357..3f525c1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/day_of_week_01/day_of_week_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/day_of_week_01/day_of_week_01.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [1970-01-01]
     :
-    FunctionCall test.day-of-week@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.day-of-week@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [1970-01-01]
       ]
     ]
@@ -13,8 +13,8 @@
   (
     LiteralExpr [STRING] [2013-08-06]
     :
-    FunctionCall test.day-of-week@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.day-of-week@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2013-08-06]
       ]
     ]
@@ -22,8 +22,8 @@
   (
     LiteralExpr [STRING] [-2013-08-06]
     :
-    FunctionCall test.day-of-week@1[
-      FunctionCall test.date@1[
+    FunctionCall asterix.day-of-week@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-2013-08-06]
       ]
     ]
@@ -31,8 +31,8 @@
   (
     LiteralExpr [STRING] [1913-08-06T15:53:28Z]
     :
-    FunctionCall test.day-of-week@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.day-of-week@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1913-08-06T15:53:28Z]
       ]
     ]
@@ -40,8 +40,8 @@
   (
     LiteralExpr [STRING] [-1913-08-10T15:53:28Z]
     :
-    FunctionCall test.day-of-week@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.day-of-week@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1913-08-10T15:53:28Z]
       ]
     ]
@@ -49,7 +49,7 @@
   (
     LiteralExpr [STRING] [null]
     :
-    FunctionCall test.day-of-week@1[
+    FunctionCall asterix.day-of-week@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_comps/duration_comps.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_comps/duration_comps.3.ast
index e6485e5..45b9b97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_comps/duration_comps.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_comps/duration_comps.3.ast
@@ -5,11 +5,11 @@
   (
     LiteralExpr [STRING] [yearMonthGreaterComp]
     :
-    FunctionCall test.year-month-duration-greater-than@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.year-month-duration-greater-than@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P13M]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1Y]
       ]
     ]
@@ -17,11 +17,11 @@
   (
     LiteralExpr [STRING] [dayTimeGreaterComp]
     :
-    FunctionCall test.day-time-duration-greater-than@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.day-time-duration-greater-than@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1D]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3D]
       ]
     ]
@@ -29,11 +29,11 @@
   (
     LiteralExpr [STRING] [yearMonthLessComp]
     :
-    FunctionCall test.year-month-duration-less-than@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.year-month-duration-less-than@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P13M]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1Y]
       ]
     ]
@@ -41,11 +41,11 @@
   (
     LiteralExpr [STRING] [dayTimeLessComp]
     :
-    FunctionCall test.day-time-duration-less-than@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.day-time-duration-less-than@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1D]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3D]
       ]
     ]
@@ -53,11 +53,11 @@
   (
     LiteralExpr [STRING] [equal1]
     :
-    FunctionCall test.duration-equal@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.duration-equal@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1D]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [PT24H]
       ]
     ]
@@ -65,11 +65,11 @@
   (
     LiteralExpr [STRING] [equal2]
     :
-    FunctionCall test.duration-equal@2[
-      FunctionCall test.duration@1[
+    FunctionCall asterix.duration-equal@2[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3D]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [PT24H]
       ]
     ]
@@ -77,17 +77,17 @@
   (
     LiteralExpr [STRING] [equal3]
     :
-    FunctionCall test.duration-equal@2[
-      FunctionCall test.duration-from-months@1[
-        FunctionCall test.months-from-year-month-duration@1[
-          FunctionCall test.get-year-month-duration@1[
-            FunctionCall test.duration@1[
+    FunctionCall asterix.duration-equal@2[
+      FunctionCall asterix.duration-from-months@1[
+        FunctionCall asterix.months-from-year-month-duration@1[
+          FunctionCall asterix.get-year-month-duration@1[
+            FunctionCall asterix.duration@1[
               LiteralExpr [STRING] [P1Y]
             ]
           ]
         ]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [P1Y]
       ]
     ]
@@ -95,17 +95,17 @@
   (
     LiteralExpr [STRING] [equal4]
     :
-    FunctionCall test.duration-equal@2[
-      FunctionCall test.duration-from-ms@1[
-        FunctionCall test.ms-from-day-time-duration@1[
-          FunctionCall test.get-day-time-duration@1[
-            FunctionCall test.duration@1[
+    FunctionCall asterix.duration-equal@2[
+      FunctionCall asterix.duration-from-ms@1[
+        FunctionCall asterix.ms-from-day-time-duration@1[
+          FunctionCall asterix.get-day-time-duration@1[
+            FunctionCall asterix.duration@1[
               LiteralExpr [STRING] [-P3D]
             ]
           ]
         ]
       ]
-      FunctionCall test.duration@1[
+      FunctionCall asterix.duration@1[
         LiteralExpr [STRING] [-P3D]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
index 79baffb..2e34252 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/duration_functions/duration_functions.3.ast
@@ -4,12 +4,12 @@
   (
     LiteralExpr [STRING] [dr1]
     :
-    FunctionCall test.duration-from-interval@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.date@1[
+    FunctionCall asterix.duration-from-interval@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2010-10-30]
         ]
-        FunctionCall test.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2010-12-21]
         ]
       ]
@@ -18,12 +18,12 @@
   (
     LiteralExpr [STRING] [dr2]
     :
-    FunctionCall test.duration-from-interval@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.datetime@1[
+    FunctionCall asterix.duration-from-interval@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2012-06-26T01:01:01.111]
         ]
-        FunctionCall test.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2012-07-27T02:02:02.222]
         ]
       ]
@@ -32,12 +32,12 @@
   (
     LiteralExpr [STRING] [dr3]
     :
-    FunctionCall test.duration-from-interval@1[
-      FunctionCall test.interval@2[
-        FunctionCall test.time@1[
+    FunctionCall asterix.duration-from-interval@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [12:32:38]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [20:29:20]
         ]
       ]
@@ -46,7 +46,7 @@
   (
     LiteralExpr [STRING] [dr4]
     :
-    FunctionCall test.duration-from-interval@1[
+    FunctionCall asterix.duration-from-interval@1[
       LiteralExpr [NULL]
     ]
   )
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
index 28fcb19..b0ebd65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/get_overlapping_interval/get_overlapping_interval.3.ast
@@ -4,20 +4,20 @@
   (
     LiteralExpr [STRING] [overlap1]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.time@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [11:23:39]
         ]
-        FunctionCall null.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [18:27:19]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.time@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [12:23:39]
         ]
-        FunctionCall null.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [23:18:00]
         ]
       ]
@@ -26,20 +26,20 @@
   (
     LiteralExpr [STRING] [overlap2]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.time@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [12:23:39]
         ]
-        FunctionCall null.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [18:27:19]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.time@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [07:19:39]
         ]
-        FunctionCall null.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [09:18:00]
         ]
       ]
@@ -48,20 +48,20 @@
   (
     LiteralExpr [STRING] [overlap3]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.date@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1980-11-30]
         ]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1999-09-09]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.date@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2014-01-01]
         ]
       ]
@@ -70,20 +70,20 @@
   (
     LiteralExpr [STRING] [overlap4]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.date@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1980-11-30]
         ]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2099-09-09]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.date@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-01-01]
         ]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2014-01-01]
         ]
       ]
@@ -92,20 +92,20 @@
   (
     LiteralExpr [STRING] [overlap5]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1844-03-03T11:19:39]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-10-30T18:27:19]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1989-03-04T12:23:39]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2009-10-10T23:18:00]
         ]
       ]
@@ -114,20 +114,20 @@
   (
     LiteralExpr [STRING] [overlap6]
     :
-    FunctionCall null.get-overlapping-interval@2[
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+    FunctionCall asterix.get-overlapping-interval@2[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1989-03-04T12:23:39]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2000-10-30T18:27:19]
         ]
       ]
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1844-03-03T11:19:39]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1888-10-10T23:18:00]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin/interval_bin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin/interval_bin.3.ast
index 90be652..45098ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin/interval_bin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin/interval_bin.3.ast
@@ -4,14 +4,14 @@
   (
     LiteralExpr [STRING] [bin1]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [1990-01-01]
       ]
-      FunctionCall test.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P1Y]
       ]
     ]
@@ -19,14 +19,14 @@
   (
     LiteralExpr [STRING] [bin2]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-1990-01-01]
       ]
-      FunctionCall test.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P1Y]
       ]
     ]
@@ -34,14 +34,14 @@
   (
     LiteralExpr [STRING] [bin3]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1990-01-01T00:00:00.000Z]
       ]
-      FunctionCall test.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P6M]
       ]
     ]
@@ -49,14 +49,14 @@
   (
     LiteralExpr [STRING] [bin4]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1987-11-19T23:49:23.938]
       ]
-      FunctionCall test.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [-1990-01-01T00:00:00.000Z]
       ]
-      FunctionCall test.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [PT12H]
       ]
     ]
@@ -64,14 +64,14 @@
   (
     LiteralExpr [STRING] [bin5]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.time@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:23:34.930+07:00]
       ]
-      FunctionCall test.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [12:00:00]
       ]
-      FunctionCall test.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [PT2H]
       ]
     ]
@@ -79,12 +79,12 @@
   (
     LiteralExpr [STRING] [bin6]
     :
-    FunctionCall test.interval-bin@3[
+    FunctionCall asterix.interval-bin@3[
       LiteralExpr [NULL]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-0023-01-01]
       ]
-      FunctionCall test.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P6M]
       ]
     ]
@@ -92,12 +92,12 @@
   (
     LiteralExpr [STRING] [bin7]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
       LiteralExpr [NULL]
-      FunctionCall test.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P6M]
       ]
     ]
@@ -105,11 +105,11 @@
   (
     LiteralExpr [STRING] [bin8]
     :
-    FunctionCall test.interval-bin@3[
-      FunctionCall test.date@1[
+    FunctionCall asterix.interval-bin@3[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [2010-10-30]
       ]
-      FunctionCall test.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-0023-01-01]
       ]
       LiteralExpr [NULL]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
index 4819073..915780c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
@@ -34,15 +34,15 @@
 Groupby
   Variable [ Name=$d ]
   :=
-  FunctionCall test.interval-bin@3[
+  FunctionCall asterix.interval-bin@3[
     FieldAccessor [
       Variable [ Name=$i ]
       Field=timestamp
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [1990-01-01T00:00:00.000Z]
     ]
-    FunctionCall test.year-month-duration@1[
+    FunctionCall asterix.year-month-duration@1[
       LiteralExpr [STRING] [P20Y]
     ]
   ]
@@ -52,7 +52,7 @@
   )
 
 Orderby
-  FunctionCall test.get-interval-start@1[
+  FunctionCall asterix.get-interval-start@1[
     Variable [ Name=$d ]
   ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
index 10467b9..cfbea3d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
@@ -34,17 +34,17 @@
 Groupby
   Variable [ Name=$d ]
   :=
-  FunctionCall test.interval-bin@3[
-    FunctionCall test.get-time-from-datetime@1[
+  FunctionCall asterix.interval-bin@3[
+    FunctionCall asterix.get-time-from-datetime@1[
       FieldAccessor [
         Variable [ Name=$i ]
         Field=timestamp
       ]
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [00:00:00.000Z]
     ]
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT10M]
     ]
   ]
@@ -54,7 +54,7 @@
   )
 
 Orderby
-  FunctionCall test.get-interval-start@1[
+  FunctionCall asterix.get-interval-start@1[
     Variable [ Name=$d ]
   ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_functions/interval_functions.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_functions/interval_functions.3.ast
index c6dd653..0aaf594 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_functions/interval_functions.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_functions/interval_functions.3.ast
@@ -2,315 +2,315 @@
 Query:
 Let Variable [ Name=$itv1 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.date@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-10-30]
     ]
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-12-21]
     ]
   ]
 Let Variable [ Name=$itv2 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.date@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2011-10-30]
     ]
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2012-10-21]
     ]
   ]
 Let Variable [ Name=$itv3 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.date@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-12-21]
     ]
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2013-01-01]
     ]
   ]
 Let Variable [ Name=$blnBefore1 ]
   :=
-  FunctionCall test.interval-before@2[
+  FunctionCall asterix.interval-before@2[
     Variable [ Name=$itv1 ]
     Variable [ Name=$itv2 ]
   ]
 Let Variable [ Name=$blnAfter1 ]
   :=
-  FunctionCall test.interval-after@2[
+  FunctionCall asterix.interval-after@2[
     Variable [ Name=$itv2 ]
     Variable [ Name=$itv1 ]
   ]
 Let Variable [ Name=$blnBefore2 ]
   :=
-  FunctionCall test.interval-before@2[
+  FunctionCall asterix.interval-before@2[
     Variable [ Name=$itv1 ]
     Variable [ Name=$itv3 ]
   ]
 Let Variable [ Name=$blnAfter2 ]
   :=
-  FunctionCall test.interval-after@2[
+  FunctionCall asterix.interval-after@2[
     Variable [ Name=$itv3 ]
     Variable [ Name=$itv1 ]
   ]
 Let Variable [ Name=$itv4 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2012-06-26T01:01:01.111]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2012-07-27T02:02:02.222]
     ]
   ]
 Let Variable [ Name=$itv5 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [20120727T020202222]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2013-08-08T03:03:03.333]
     ]
   ]
 Let Variable [ Name=$itv6 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [19000707T020202222]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2013-08-07T03:03:03.333]
     ]
   ]
 Let Variable [ Name=$blnMeet1 ]
   :=
-  FunctionCall test.interval-meets@2[
+  FunctionCall asterix.interval-meets@2[
     Variable [ Name=$itv4 ]
     Variable [ Name=$itv5 ]
   ]
 Let Variable [ Name=$blnMetBy1 ]
   :=
-  FunctionCall test.interval-met-by@2[
+  FunctionCall asterix.interval-met-by@2[
     Variable [ Name=$itv5 ]
     Variable [ Name=$itv4 ]
   ]
 Let Variable [ Name=$blnMeet2 ]
   :=
-  FunctionCall test.interval-meets@2[
+  FunctionCall asterix.interval-meets@2[
     Variable [ Name=$itv6 ]
     Variable [ Name=$itv4 ]
   ]
 Let Variable [ Name=$blnMetBy2 ]
   :=
-  FunctionCall test.interval-met-by@2[
+  FunctionCall asterix.interval-met-by@2[
     Variable [ Name=$itv6 ]
     Variable [ Name=$itv4 ]
   ]
 Let Variable [ Name=$itv7 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.time@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [12:32:38]
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [20:29:20]
     ]
   ]
 Let Variable [ Name=$itv8 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.time@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [17:48:19]
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [22:19:49]
     ]
   ]
 Let Variable [ Name=$itv9 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.time@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [01:32:49]
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [17:48:19]
     ]
   ]
 Let Variable [ Name=$blnOverlaps1 ]
   :=
-  FunctionCall test.interval-overlaps@2[
+  FunctionCall asterix.interval-overlaps@2[
     Variable [ Name=$itv7 ]
     Variable [ Name=$itv8 ]
   ]
 Let Variable [ Name=$blnOverlapped1 ]
   :=
-  FunctionCall test.interval-overlapped-by@2[
+  FunctionCall asterix.interval-overlapped-by@2[
     Variable [ Name=$itv8 ]
     Variable [ Name=$itv7 ]
   ]
 Let Variable [ Name=$blnOverlaps2 ]
   :=
-  FunctionCall test.interval-overlaps@2[
+  FunctionCall asterix.interval-overlaps@2[
     Variable [ Name=$itv9 ]
     Variable [ Name=$itv8 ]
   ]
 Let Variable [ Name=$blnOverlapped2 ]
   :=
-  FunctionCall test.interval-overlapped-by@2[
+  FunctionCall asterix.interval-overlapped-by@2[
     Variable [ Name=$itv8 ]
     Variable [ Name=$itv9 ]
   ]
 Let Variable [ Name=$blnOverlap1 ]
   :=
-  FunctionCall test.interval-overlapping@2[
+  FunctionCall asterix.interval-overlapping@2[
     Variable [ Name=$itv9 ]
     Variable [ Name=$itv7 ]
   ]
 Let Variable [ Name=$blnOverlap2 ]
   :=
-  FunctionCall test.interval-overlapping@2[
+  FunctionCall asterix.interval-overlapping@2[
     Variable [ Name=$itv9 ]
     Variable [ Name=$itv8 ]
   ]
 Let Variable [ Name=$itv10 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.date@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-10-30]
     ]
-    FunctionCall test.date@1[
+    FunctionCall asterix.date@1[
       LiteralExpr [STRING] [2010-11-30]
     ]
   ]
 Let Variable [ Name=$blnStarts1 ]
   :=
-  FunctionCall test.interval-starts@2[
+  FunctionCall asterix.interval-starts@2[
     Variable [ Name=$itv10 ]
     Variable [ Name=$itv1 ]
   ]
 Let Variable [ Name=$blnStarts2 ]
   :=
-  FunctionCall test.interval-starts@2[
+  FunctionCall asterix.interval-starts@2[
     Variable [ Name=$itv10 ]
     Variable [ Name=$itv2 ]
   ]
 Let Variable [ Name=$blnStartedBy1 ]
   :=
-  FunctionCall test.interval-started-by@2[
+  FunctionCall asterix.interval-started-by@2[
     Variable [ Name=$itv1 ]
     Variable [ Name=$itv10 ]
   ]
 Let Variable [ Name=$blnStartedBy2 ]
   :=
-  FunctionCall test.interval-started-by@2[
+  FunctionCall asterix.interval-started-by@2[
     Variable [ Name=$itv10 ]
     Variable [ Name=$itv2 ]
   ]
 Let Variable [ Name=$itv10 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [19000707T020202222]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2013-08-07T03:03:03.333]
     ]
   ]
 Let Variable [ Name=$itv11 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [19990707T020202222]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2013-08-07T03:03:03.333]
     ]
   ]
 Let Variable [ Name=$itv12 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.datetime@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [-19990707T020202222]
     ]
-    FunctionCall test.datetime@1[
+    FunctionCall asterix.datetime@1[
       LiteralExpr [STRING] [2013-08-07T03:03:03.333]
     ]
   ]
 Let Variable [ Name=$blnCovers1 ]
   :=
-  FunctionCall test.interval-covers@2[
+  FunctionCall asterix.interval-covers@2[
     Variable [ Name=$itv10 ]
     Variable [ Name=$itv11 ]
   ]
 Let Variable [ Name=$blnCovers2 ]
   :=
-  FunctionCall test.interval-covers@2[
+  FunctionCall asterix.interval-covers@2[
     Variable [ Name=$itv10 ]
     Variable [ Name=$itv12 ]
   ]
 Let Variable [ Name=$blnCoveredBy1 ]
   :=
-  FunctionCall test.interval-covered-by@2[
+  FunctionCall asterix.interval-covered-by@2[
     Variable [ Name=$itv11 ]
     Variable [ Name=$itv10 ]
   ]
 Let Variable [ Name=$blnCoveredBy2 ]
   :=
-  FunctionCall test.interval-covered-by@2[
+  FunctionCall asterix.interval-covered-by@2[
     Variable [ Name=$itv12 ]
     Variable [ Name=$itv10 ]
   ]
 Let Variable [ Name=$itv11 ]
   :=
-  FunctionCall test.interval@2[
-    FunctionCall test.time@1[
+  FunctionCall asterix.interval@2[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [19:00:00.009]
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [20:29:20.000]
     ]
   ]
 Let Variable [ Name=$blnEnds1 ]
   :=
-  FunctionCall test.interval-ends@2[
+  FunctionCall asterix.interval-ends@2[
     Variable [ Name=$itv11 ]
     Variable [ Name=$itv7 ]
   ]
 Let Variable [ Name=$blnEnds2 ]
   :=
-  FunctionCall test.interval-ends@2[
+  FunctionCall asterix.interval-ends@2[
     Variable [ Name=$itv11 ]
     Variable [ Name=$itv8 ]
   ]
 Let Variable [ Name=$blnEndedBy1 ]
   :=
-  FunctionCall test.interval-ended-by@2[
+  FunctionCall asterix.interval-ended-by@2[
     Variable [ Name=$itv7 ]
     Variable [ Name=$itv11 ]
   ]
 Let Variable [ Name=$blnEndedBy2 ]
   :=
-  FunctionCall test.interval-ended-by@2[
+  FunctionCall asterix.interval-ended-by@2[
     Variable [ Name=$itv8 ]
     Variable [ Name=$itv11 ]
   ]
 Let Variable [ Name=$null1 ]
   :=
-  FunctionCall test.interval-before@2[
+  FunctionCall asterix.interval-before@2[
     LiteralExpr [NULL]
     Variable [ Name=$itv2 ]
   ]
 Let Variable [ Name=$null2 ]
   :=
-  FunctionCall test.interval-covered-by@2[
+  FunctionCall asterix.interval-covered-by@2[
     Variable [ Name=$itv11 ]
     LiteralExpr [NULL]
   ]
 Let Variable [ Name=$null3 ]
   :=
-  FunctionCall test.interval-overlapping@2[
+  FunctionCall asterix.interval-overlapping@2[
     LiteralExpr [NULL]
     LiteralExpr [NULL]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins/overlap_bins.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins/overlap_bins.3.ast
index 01cd805..53a760a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins/overlap_bins.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins/overlap_bins.3.ast
@@ -3,19 +3,19 @@
   (
     LiteralExpr [STRING] [timebins]
     :
-    FunctionCall null.overlap-bins@3[
-      FunctionCall null.interval@2[
-        FunctionCall null.time@1[
+    FunctionCall asterix.overlap-bins@3[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [17:23:37]
         ]
-        FunctionCall null.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [18:30:21]
         ]
       ]
-      FunctionCall null.time@1[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [00:00:00]
       ]
-      FunctionCall null.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [PT30M]
       ]
     ]
@@ -23,19 +23,19 @@
   (
     LiteralExpr [STRING] [datebins]
     :
-    FunctionCall null.overlap-bins@3[
-      FunctionCall null.interval@2[
-        FunctionCall null.date@1[
+    FunctionCall asterix.overlap-bins@3[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [1984-03-17]
         ]
-        FunctionCall null.date@1[
+        FunctionCall asterix.date@1[
           LiteralExpr [STRING] [2013-08-22]
         ]
       ]
-      FunctionCall null.date@1[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [1990-01-01]
       ]
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P10Y]
       ]
     ]
@@ -43,19 +43,19 @@
   (
     LiteralExpr [STRING] [datetimebins]
     :
-    FunctionCall null.overlap-bins@3[
-      FunctionCall null.interval@2[
-        FunctionCall null.datetime@1[
+    FunctionCall asterix.overlap-bins@3[
+      FunctionCall asterix.interval@2[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1800-01-01T23:59:48.938]
         ]
-        FunctionCall null.datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [2015-07-26T13:28:30.218]
         ]
       ]
-      FunctionCall null.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1900-01-01T00:00:00.000]
       ]
-      FunctionCall null.year-month-duration@1[
+      FunctionCall asterix.year-month-duration@1[
         LiteralExpr [STRING] [P100Y]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
index ea0f18c..52ee3be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
@@ -18,7 +18,7 @@
   (
     LiteralExpr [STRING] [overlap]
     :
-    FunctionCall test.get-overlapping-interval@2[
+    FunctionCall asterix.get-overlapping-interval@2[
       FieldAccessor [
         Variable [ Name=$gen0 ]
         Field=bin
@@ -72,8 +72,8 @@
       )
       AS Variable [ Name=$i ]
 ,
-      FunctionCall test.overlap-bins@3[
-        FunctionCall test.interval-start-from-time@2[
+      FunctionCall asterix.overlap-bins@3[
+        FunctionCall asterix.interval-start-from-time@2[
           FieldAccessor [
             Variable [ Name=$i ]
             Field=time
@@ -83,10 +83,10 @@
             Field=duration
           ]
         ]
-        FunctionCall test.time@1[
+        FunctionCall asterix.time@1[
           LiteralExpr [STRING] [00:00:00]
         ]
-        FunctionCall test.day-time-duration@1[
+        FunctionCall asterix.day-time-duration@1[
           LiteralExpr [STRING] [PT1H30M]
         ]
       ]
@@ -103,7 +103,7 @@
       )
 
     Orderby
-      FunctionCall test.get-interval-start@1[
+      FunctionCall asterix.get-interval-start@1[
         Variable [ Name=$bin ]
       ]
       ASC
@@ -119,7 +119,7 @@
 ]
 Let Variable [ Name=$itv ]
   :=
-  FunctionCall test.interval-start-from-time@2[
+  FunctionCall asterix.interval-start-from-time@2[
     FieldAccessor [
       Variable [ Name=$x ]
       Field=time
@@ -130,7 +130,7 @@
     ]
   ]
 Orderby
-  FunctionCall test.get-interval-start@1[
+  FunctionCall asterix.get-interval-start@1[
     FieldAccessor [
       Variable [ Name=$gen0 ]
       Field=bin
@@ -139,7 +139,7 @@
   ASC
   Variable [ Name=$itv ]
   ASC
-  FunctionCall test.get-overlapping-interval@2[
+  FunctionCall asterix.get-overlapping-interval@2[
     FieldAccessor [
       Variable [ Name=$gen0 ]
       Field=bin
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
index f30c61a..9bab832 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
@@ -27,9 +27,9 @@
     FunctionCall asterix.sum@1[
       (
         SELECT ELEMENT [
-        FunctionCall test.ms-from-day-time-duration@1[
-          FunctionCall test.duration-from-interval@1[
-            FunctionCall test.get-overlapping-interval@2[
+        FunctionCall asterix.ms-from-day-time-duration@1[
+          FunctionCall asterix.duration-from-interval@1[
+            FunctionCall asterix.get-overlapping-interval@2[
               Variable [ Name=$bin ]
               FieldAccessor [
                 FieldAccessor [
@@ -56,7 +56,7 @@
       (
         LiteralExpr [STRING] [interval]
         :
-        FunctionCall test.interval-start-from-time@2[
+        FunctionCall asterix.interval-start-from-time@2[
           FieldAccessor [
             Variable [ Name=$i1 ]
             Field=time
@@ -84,15 +84,15 @@
   )
   AS Variable [ Name=$i2 ]
 ,
-  FunctionCall test.overlap-bins@3[
+  FunctionCall asterix.overlap-bins@3[
     FieldAccessor [
       Variable [ Name=$i2 ]
       Field=interval
     ]
-    FunctionCall test.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [00:00:00]
     ]
-    FunctionCall test.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT1H30M]
     ]
   ]
@@ -109,7 +109,7 @@
   )
 
 Orderby
-  FunctionCall test.get-interval-start@1[
+  FunctionCall asterix.get-interval-start@1[
     Variable [ Name=$bin ]
   ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
index 2a3e8f2..e8b8b9e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
@@ -43,14 +43,14 @@
         AS Variable [ Name=$i ]
       ]
       Where
-        FunctionCall multitask.interval-covers@2[
+        FunctionCall asterix.interval-covers@2[
           Variable [ Name=$bin ]
-          FunctionCall multitask.interval-start-from-time@2[
+          FunctionCall asterix.interval-start-from-time@2[
             FieldAccessor [
               Variable [ Name=$i ]
               Field=time
             ]
-            FunctionCall multitask.duration-from-ms@1[
+            FunctionCall asterix.duration-from-ms@1[
               FieldAccessor [
                 Variable [ Name=$i ]
                 Field=duration
@@ -92,8 +92,8 @@
   )
 ]
 ]
-FROM [  FunctionCall multitask.overlap-bins@3[
-    FunctionCall multitask.interval@2[
+FROM [  FunctionCall asterix.overlap-bins@3[
+    FunctionCall asterix.interval@2[
       FunctionCall asterix.min@1[
         (
           SELECT ELEMENT [
@@ -118,7 +118,7 @@
               Field=time
             ]
             +
-            FunctionCall multitask.duration-from-ms@1[
+            FunctionCall asterix.duration-from-ms@1[
               OperatorExpr [
                 FieldAccessor [
                   Variable [ Name=$i ]
@@ -138,17 +138,17 @@
         )
       ]
     ]
-    FunctionCall multitask.time@1[
+    FunctionCall asterix.time@1[
       LiteralExpr [STRING] [00:00:00.000]
     ]
-    FunctionCall multitask.day-time-duration@1[
+    FunctionCall asterix.day-time-duration@1[
       LiteralExpr [STRING] [PT1M]
     ]
   ]
   AS Variable [ Name=$bin ]
 ]
 Orderby
-  FunctionCall multitask.get-interval-start@1[
+  FunctionCall asterix.get-interval-start@1[
     Variable [ Name=$bin ]
   ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_01/parse_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_01/parse_01.3.ast
index 8f307fa..08e0b89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_01/parse_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_01/parse_01.3.ast
@@ -5,7 +5,7 @@
   (
     LiteralExpr [STRING] [date1]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [2013-8-23]
       LiteralExpr [STRING] [YY-M-D]
     ]
@@ -13,7 +13,7 @@
   (
     LiteralExpr [STRING] [date2]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [Aug 12 -12]
       LiteralExpr [STRING] [MMM D Y]
     ]
@@ -21,7 +21,7 @@
   (
     LiteralExpr [STRING] [date3]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [-1234-01-01]
       LiteralExpr [STRING] [YYYY-MM-DD]
     ]
@@ -29,7 +29,7 @@
   (
     LiteralExpr [STRING] [date4]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [09/11/-1980]
       LiteralExpr [STRING] [D/M/Y]
     ]
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [date5]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [09/11/-1990]
       LiteralExpr [STRING] [YY-M-D|MMM D Y|D/M/Y]
     ]
@@ -45,7 +45,7 @@
   (
     LiteralExpr [STRING] [date6]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [Mon Aug 19 2013]
       LiteralExpr [STRING] [W MMM D Y]
     ]
@@ -53,7 +53,7 @@
   (
     LiteralExpr [STRING] [data7]
     :
-    FunctionCall test.parse-date@2[
+    FunctionCall asterix.parse-date@2[
       LiteralExpr [STRING] [SKIPMEPLEASE Mon Aug SKIPME1ALSO 19 2013]
       LiteralExpr [STRING] [O W MMM O D Y]
     ]
@@ -61,7 +61,7 @@
   (
     LiteralExpr [STRING] [time1]
     :
-    FunctionCall test.parse-time@2[
+    FunctionCall asterix.parse-time@2[
       LiteralExpr [STRING] [8:23:49]
       LiteralExpr [STRING] [h:m:s]
     ]
@@ -69,7 +69,7 @@
   (
     LiteralExpr [STRING] [time2]
     :
-    FunctionCall test.parse-time@2[
+    FunctionCall asterix.parse-time@2[
       LiteralExpr [STRING] [8.19.23:32]
       LiteralExpr [STRING] [h.m.s:nn]
     ]
@@ -77,7 +77,7 @@
   (
     LiteralExpr [STRING] [time3]
     :
-    FunctionCall test.parse-time@2[
+    FunctionCall asterix.parse-time@2[
       LiteralExpr [STRING] [08.19.23:32 pm]
       LiteralExpr [STRING] [h.m.s:nn a]
     ]
@@ -85,7 +85,7 @@
   (
     LiteralExpr [STRING] [time4]
     :
-    FunctionCall test.parse-time@2[
+    FunctionCall asterix.parse-time@2[
       LiteralExpr [STRING] [6:30:40.948 pm PST]
       LiteralExpr [STRING] [h:mm:ss.nnn a z]
     ]
@@ -93,7 +93,7 @@
   (
     LiteralExpr [STRING] [time5]
     :
-    FunctionCall test.parse-time@2[
+    FunctionCall asterix.parse-time@2[
       LiteralExpr [STRING] [6:30:40.948 pm PST]
       LiteralExpr [STRING] [h:m:s|h.m.s:nn|h.m.s:nn a|h:mm:ss.nnn a z]
     ]
@@ -101,7 +101,7 @@
   (
     LiteralExpr [STRING] [datetime1]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [Dec 30 -1203 3:48:27 PM]
       LiteralExpr [STRING] [MMM DD YYYY h:m:s a]
     ]
@@ -109,7 +109,7 @@
   (
     LiteralExpr [STRING] [datetime2]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [12/30/-1203 03:48:27.392 PM Asia/Shanghai]
       LiteralExpr [STRING] [MM/DD/YYY hh:mm:ss.nnn a z]
     ]
@@ -117,7 +117,7 @@
   (
     LiteralExpr [STRING] [datetime3]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [1723-12-03T23:59:23.392Z]
       LiteralExpr [STRING] [YYYY-MM-DDThh:mm:ss.nnnz]
     ]
@@ -125,7 +125,7 @@
   (
     LiteralExpr [STRING] [datetime4]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [1723-12-03T23:59:23.392-04:00]
       LiteralExpr [STRING] [YYYY-MM-DDThh:mm:ss.nnnz]
     ]
@@ -133,7 +133,7 @@
   (
     LiteralExpr [STRING] [datetime5]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [1723-12-03T23:59:23.392-04:00]
       LiteralExpr [STRING] [MMM DD YYYY h:m:s a|MM/DD/YYY hh:mm:ss.nnn a z|YYYY-MM-DDThh:mm:ss.nnnz]
     ]
@@ -141,7 +141,7 @@
   (
     LiteralExpr [STRING] [datetime6]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [1970-01-01 Thu 23:59:23.392-04:00]
       LiteralExpr [STRING] [MMM DD YYYY h:m:s a|MM/DD/YYY hh:mm:ss.nnn a z|YYYY-MM-DD W hh:mm:ss.nnnz]
     ]
@@ -149,7 +149,7 @@
   (
     LiteralExpr [STRING] [datetime7]
     :
-    FunctionCall test.parse-datetime@2[
+    FunctionCall asterix.parse-datetime@2[
       LiteralExpr [STRING] [1723-12-03 What3v3r STRINGHERE 23:59:23.392-04:00]
       LiteralExpr [STRING] [MMM DD YYYY h:m:s a|MM/DD/YYY hh:mm:ss.nnn a z|YYYY-MM-DD O O hh:mm:ss.nnnz]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_02/parse_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_02/parse_02.3.ast
index 5ff0efc..ea8c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_02/parse_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/parse_02/parse_02.3.ast
@@ -4,8 +4,8 @@
   (
     LiteralExpr [STRING] [date-string-1]
     :
-    FunctionCall test.print-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.print-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-0123-01-30]
       ]
       LiteralExpr [STRING] [YY/M/D]
@@ -14,8 +14,8 @@
   (
     LiteralExpr [STRING] [date-string-2]
     :
-    FunctionCall test.print-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.print-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-0123-01-30]
       ]
       LiteralExpr [STRING] [MMM DD, YYYY]
@@ -24,8 +24,8 @@
   (
     LiteralExpr [STRING] [date-string-3]
     :
-    FunctionCall test.print-date@2[
-      FunctionCall test.date@1[
+    FunctionCall asterix.print-date@2[
+      FunctionCall asterix.date@1[
         LiteralExpr [STRING] [-0123-01-30]
       ]
       LiteralExpr [STRING] [YYYY/MM/DD]
@@ -34,8 +34,8 @@
   (
     LiteralExpr [STRING] [time-string-1]
     :
-    FunctionCall test.print-time@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.print-time@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [08:07:29.030Z]
       ]
       LiteralExpr [STRING] [h.m.s.nn a z]
@@ -44,8 +44,8 @@
   (
     LiteralExpr [STRING] [time-string-2]
     :
-    FunctionCall test.print-time@2[
-      FunctionCall test.time@1[
+    FunctionCall asterix.print-time@2[
+      FunctionCall asterix.time@1[
         LiteralExpr [STRING] [08:07:29.030Z]
       ]
       LiteralExpr [STRING] [hh.mm.ss.nnn a z]
@@ -54,8 +54,8 @@
   (
     LiteralExpr [STRING] [datetime-string-1]
     :
-    FunctionCall test.print-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.print-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [0137-12-31T23:59:59.999+08:00]
       ]
       LiteralExpr [STRING] [MMM DD h:m:s.nnn a YY z]
@@ -64,8 +64,8 @@
   (
     LiteralExpr [STRING] [datetime-string-2]
     :
-    FunctionCall test.print-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.print-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [0137-12-31T23:59:59.999+08:00]
       ]
       LiteralExpr [STRING] [YYYY/MMM/DD h:m:s.nnnz a]
@@ -74,8 +74,8 @@
   (
     LiteralExpr [STRING] [datetime-string-3]
     :
-    FunctionCall test.print-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.print-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [0137-12-31T23:59:59.999+08:00]
       ]
       LiteralExpr [STRING] [YYYY-MM-DDThh:mm:ss.nnnz]
@@ -84,8 +84,8 @@
   (
     LiteralExpr [STRING] [datetime-string-4]
     :
-    FunctionCall test.print-datetime@2[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.print-datetime@2[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1000-10-10T10:10:10.100+00:00]
       ]
       LiteralExpr [STRING] [YYYY-MM-DDThh:mm:ss.nnnz]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/time_functions/time_functions.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/time_functions/time_functions.3.ast
index 2baf9252d..57002df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/time_functions/time_functions.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/time_functions/time_functions.3.ast
@@ -5,15 +5,15 @@
   (
     LiteralExpr [STRING] [time1]
     :
-    FunctionCall test.time-from-unix-time-in-ms@1[
+    FunctionCall asterix.time-from-unix-time-in-ms@1[
       LiteralExpr [LONG] [1560074]
     ]
   )
   (
     LiteralExpr [STRING] [time2]
     :
-    FunctionCall test.get-time-from-datetime@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-time-from-datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
       ]
     ]
@@ -21,8 +21,8 @@
   (
     LiteralExpr [STRING] [time3]
     :
-    FunctionCall test.get-time-from-datetime@1[
-      FunctionCall test.datetime@1[
+    FunctionCall asterix.get-time-from-datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-10-11T02:30:23+03:00]
       ]
     ]
@@ -31,11 +31,11 @@
     LiteralExpr [STRING] [time4]
     :
     OperatorExpr [
-      FunctionCall test.time-from-unix-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
       +
-      FunctionCall test.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [-PT30H]
       ]
     ]
@@ -44,13 +44,13 @@
     LiteralExpr [STRING] [time5]
     :
     OperatorExpr [
-      FunctionCall test.get-time-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-time-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
       +
-      FunctionCall test.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [PT36M]
       ]
     ]
@@ -58,8 +58,8 @@
   (
     LiteralExpr [STRING] [unix1]
     :
-    FunctionCall test.unix-time-from-time-in-ms@1[
-      FunctionCall test.time-from-unix-time-in-ms@1[
+    FunctionCall asterix.unix-time-from-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
     ]
@@ -69,19 +69,19 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.get-time-from-datetime@1[
-          FunctionCall test.datetime@1[
+        FunctionCall asterix.get-time-from-datetime@1[
+          FunctionCall asterix.datetime@1[
             LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
           ]
         ]
         +
-        FunctionCall test.day-time-duration@1[
+        FunctionCall asterix.day-time-duration@1[
           LiteralExpr [STRING] [PT36M]
         ]
       ]
       -
-      FunctionCall test.get-time-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-time-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
@@ -92,16 +92,16 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.time-from-unix-time-in-ms@1[
+        FunctionCall asterix.time-from-unix-time-in-ms@1[
           LiteralExpr [LONG] [1560074]
         ]
         +
-        FunctionCall test.day-time-duration@1[
+        FunctionCall asterix.day-time-duration@1[
           LiteralExpr [STRING] [-PT30H]
         ]
       ]
       -
-      FunctionCall test.time-from-unix-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
     ]
@@ -110,33 +110,33 @@
     LiteralExpr [STRING] [c1]
     :
     OperatorExpr [
-      FunctionCall test.time-from-unix-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
       =
       OperatorExpr [
         OperatorExpr [
-          FunctionCall test.time-from-unix-time-in-ms@1[
+          FunctionCall asterix.time-from-unix-time-in-ms@1[
             LiteralExpr [LONG] [1560074]
           ]
           -
           OperatorExpr [
-            FunctionCall test.time-from-unix-time-in-ms@1[
+            FunctionCall asterix.time-from-unix-time-in-ms@1[
               LiteralExpr [LONG] [1560074]
             ]
             +
-            FunctionCall test.day-time-duration@1[
+            FunctionCall asterix.day-time-duration@1[
               LiteralExpr [STRING] [-PT30H]
             ]
           ]
         ]
         +
         OperatorExpr [
-          FunctionCall test.time-from-unix-time-in-ms@1[
+          FunctionCall asterix.time-from-unix-time-in-ms@1[
             LiteralExpr [LONG] [1560074]
           ]
           +
-          FunctionCall test.day-time-duration@1[
+          FunctionCall asterix.day-time-duration@1[
             LiteralExpr [STRING] [-PT30H]
           ]
         ]
@@ -147,40 +147,40 @@
     LiteralExpr [STRING] [c2]
     :
     OperatorExpr [
-      FunctionCall test.get-time-from-datetime@1[
-        FunctionCall test.datetime@1[
+      FunctionCall asterix.get-time-from-datetime@1[
+        FunctionCall asterix.datetime@1[
           LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
         ]
       ]
       =
       OperatorExpr [
         OperatorExpr [
-          FunctionCall test.get-time-from-datetime@1[
-            FunctionCall test.datetime@1[
+          FunctionCall asterix.get-time-from-datetime@1[
+            FunctionCall asterix.datetime@1[
               LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
             ]
           ]
           +
-          FunctionCall test.day-time-duration@1[
+          FunctionCall asterix.day-time-duration@1[
             LiteralExpr [STRING] [PT36M]
           ]
         ]
         +
         OperatorExpr [
-          FunctionCall test.get-time-from-datetime@1[
-            FunctionCall test.datetime@1[
+          FunctionCall asterix.get-time-from-datetime@1[
+            FunctionCall asterix.datetime@1[
               LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
             ]
           ]
           -
           OperatorExpr [
-            FunctionCall test.get-time-from-datetime@1[
-              FunctionCall test.datetime@1[
+            FunctionCall asterix.get-time-from-datetime@1[
+              FunctionCall asterix.datetime@1[
                 LiteralExpr [STRING] [1327-12-02T23:35:49.938Z]
               ]
             ]
             +
-            FunctionCall test.day-time-duration@1[
+            FunctionCall asterix.day-time-duration@1[
               LiteralExpr [STRING] [PT36M]
             ]
           ]
@@ -191,21 +191,21 @@
   (
     LiteralExpr [STRING] [null1]
     :
-    FunctionCall test.time-from-unix-time-in-ms@1[
+    FunctionCall asterix.time-from-unix-time-in-ms@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [nullunix1]
     :
-    FunctionCall test.unix-time-from-time-in-ms@1[
+    FunctionCall asterix.unix-time-from-time-in-ms@1[
       LiteralExpr [NULL]
     ]
   )
   (
     LiteralExpr [STRING] [null2]
     :
-    FunctionCall test.get-time-from-datetime@1[
+    FunctionCall asterix.get-time-from-datetime@1[
       LiteralExpr [NULL]
     ]
   )
@@ -215,7 +215,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       +
-      FunctionCall test.day-time-duration@1[
+      FunctionCall asterix.day-time-duration@1[
         LiteralExpr [STRING] [-PT30H]
       ]
     ]
@@ -224,7 +224,7 @@
     LiteralExpr [STRING] [null4]
     :
     OperatorExpr [
-      FunctionCall test.time-from-unix-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
       +
@@ -237,7 +237,7 @@
     OperatorExpr [
       LiteralExpr [NULL]
       -
-      FunctionCall test.time-from-unix-time-in-ms@1[
+      FunctionCall asterix.time-from-unix-time-in-ms@1[
         LiteralExpr [LONG] [1560074]
       ]
     ]
@@ -247,11 +247,11 @@
     :
     OperatorExpr [
       OperatorExpr [
-        FunctionCall test.time-from-unix-time-in-ms@1[
+        FunctionCall asterix.time-from-unix-time-in-ms@1[
           LiteralExpr [LONG] [1560074]
         ]
         +
-        FunctionCall test.day-time-duration@1[
+        FunctionCall asterix.day-time-duration@1[
           LiteralExpr [STRING] [-PT30H]
         ]
       ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
index 212935c..3f12340 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
@@ -33,7 +33,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall TinySocial.spatial-distance@2[
+          FunctionCall asterix.spatial-distance@2[
             FieldAccessor [
               Variable [ Name=$t ]
               Field=sender-location
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
index 32e545b..cb6ebeb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
@@ -36,7 +36,7 @@
   Groupby
     Variable [ Name=$min ]
     :=
-    FunctionCall TinySocial.get-minute@1[
+    FunctionCall asterix.get-minute@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$k ]
@@ -65,7 +65,7 @@
 Groupby
   Variable [ Name=$h ]
   :=
-  FunctionCall TinySocial.get-hour@1[
+  FunctionCall asterix.get-hour@1[
     FieldAccessor [
       Variable [ Name=$t ]
       Field=send-time
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
index 0da93150..15f7143 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
@@ -64,7 +64,7 @@
   ]
 Let Variable [ Name=#3 ]
   :=
-  FunctionCall TinySocial.substring@2[
+  FunctionCall asterix.substring@2[
     FieldAccessor [
       Variable [ Name=$message ]
       Field=message
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
index a1377a6..f130474 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
@@ -4,7 +4,7 @@
 FunctionCall asterix.avg@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$message ]
         Field=message
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
index eb31c41..6e0bcfb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
@@ -6,7 +6,7 @@
 FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.get-year@1[
+    FunctionCall asterix.get-year@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=#2 ]
@@ -42,7 +42,7 @@
 FunctionCall asterix.sql-sum@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.get-year@1[
+    FunctionCall asterix.get-year@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=#4 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
index 7df69ee..ad577cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
@@ -4,7 +4,7 @@
 FunctionCall asterix.sql-avg@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.get-year@1[
+    FunctionCall asterix.get-year@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=#2 ]
@@ -40,7 +40,7 @@
 FunctionCall asterix.sql-sum@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.get-year@1[
+    FunctionCall asterix.get-year@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=#4 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
index 1447bdc..85f493c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
@@ -16,7 +16,7 @@
         Field=user-since
       ]
       >=
-      FunctionCall TinySocial.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2010-07-22T00:00:00]
       ]
     ]
@@ -27,7 +27,7 @@
         Field=user-since
       ]
       <=
-      FunctionCall TinySocial.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-07-29T23:59:59]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
index 212935c..3f12340 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
@@ -33,7 +33,7 @@
       ]
       Where
         OperatorExpr [
-          FunctionCall TinySocial.spatial-distance@2[
+          FunctionCall asterix.spatial-distance@2[
             FieldAccessor [
               Variable [ Name=$t ]
               Field=sender-location
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
index 32e545b..cb6ebeb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
@@ -36,7 +36,7 @@
   Groupby
     Variable [ Name=$min ]
     :=
-    FunctionCall TinySocial.get-minute@1[
+    FunctionCall asterix.get-minute@1[
       FieldAccessor [
         FieldAccessor [
           Variable [ Name=$k ]
@@ -65,7 +65,7 @@
 Groupby
   Variable [ Name=$h ]
   :=
-  FunctionCall TinySocial.get-hour@1[
+  FunctionCall asterix.get-hour@1[
     FieldAccessor [
       Variable [ Name=$t ]
       Field=send-time
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
index 0da93150..15f7143 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
@@ -64,7 +64,7 @@
   ]
 Let Variable [ Name=#3 ]
   :=
-  FunctionCall TinySocial.substring@2[
+  FunctionCall asterix.substring@2[
     FieldAccessor [
       Variable [ Name=$message ]
       Field=message
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
index a1377a6..f130474 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
@@ -4,7 +4,7 @@
 FunctionCall asterix.avg@1[
   (
     SELECT ELEMENT [
-    FunctionCall TinySocial.string-length@1[
+    FunctionCall asterix.string-length@1[
       FieldAccessor [
         Variable [ Name=$message ]
         Field=message
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
index 1447bdc..85f493c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
@@ -16,7 +16,7 @@
         Field=user-since
       ]
       >=
-      FunctionCall TinySocial.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2010-07-22T00:00:00]
       ]
     ]
@@ -27,7 +27,7 @@
         Field=user-since
       ]
       <=
-      FunctionCall TinySocial.datetime@1[
+      FunctionCall asterix.datetime@1[
         LiteralExpr [STRING] [2012-07-29T23:59:59]
       ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.ast
index 1a0f2bfc..d08ba3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.counthashed-gram-tokens@3[
+  FunctionCall asterix.counthashed-gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.ast
index da0deb1..0e91f28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.counthashed-gram-tokens@3[
+  FunctionCall asterix.counthashed-gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [TRUE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.ast
index 3e31997..5f3ff16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Hello World, I would like to inform you of the importance of Foo Bar. Yes, Foo Bar. Jürgen.]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.counthashed-word-tokens@1[
+  FunctionCall asterix.counthashed-word-tokens@1[
     Variable [ Name=$txt ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.3.ast
index ffcb3aa..f172403 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.3.ast
index 38fa7a41..f92151c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.gram-tokens@3[
+  FunctionCall asterix.gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [TRUE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.ast
index 3fe7f85..367ea0a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_01/hashed-gram-tokens_01.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.hashed-gram-tokens@3[
+  FunctionCall asterix.hashed-gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [FALSE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.ast
index 650c19b..155258f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-gram-tokens_02/hashed-gram-tokens_02.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Jürgen S. Generic's Car]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.hashed-gram-tokens@3[
+  FunctionCall asterix.hashed-gram-tokens@3[
     Variable [ Name=$txt ]
     LiteralExpr [LONG] [3]
     LiteralExpr [TRUE]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.ast
index 686b329..858964c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/hashed-word-tokens_01/hashed-word-tokens_01.3.ast
@@ -6,7 +6,7 @@
   LiteralExpr [STRING] [Hello World, I would like to inform you of the importance of Foo Bar. Yes, Foo Bar. Jürgen.]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.hashed-word-tokens@1[
+  FunctionCall asterix.hashed-word-tokens@1[
     Variable [ Name=$txt ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_01/word-tokens_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_01/word-tokens_01.3.ast
index 7e5a36d..5e432d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_01/word-tokens_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_01/word-tokens_01.3.ast
@@ -5,7 +5,7 @@
   LiteralExpr [STRING] [Hello World, I would like to inform you of the importance of Foo Bar. Yes, Foo Bar. Jürgen.]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     Variable [ Name=$txt ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_02/word-tokens_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_02/word-tokens_02.3.ast
index ffc58ee..0a608d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_02/word-tokens_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tokenizers/word-tokens_02/word-tokens_02.3.ast
@@ -5,7 +5,7 @@
   LiteralExpr [STRING] [ΩΣ]
 Let Variable [ Name=$tokens ]
   :=
-  FunctionCall test.word-tokens@1[
+  FunctionCall asterix.word-tokens@1[
     Variable [ Name=$txt ]
   ]
 SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
index 162701b..e715133 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
@@ -337,7 +337,7 @@
       (
         LiteralExpr [STRING] [ps_min_supplycost]
         :
-        FunctionCall asterix.min@1[
+        FunctionCall tpch.STRICT_MIN@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
index 4de6f4e..1d4ed44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
@@ -317,7 +317,7 @@
 ]
 Let Variable [ Name=$l_year0 ]
   :=
-  FunctionCall tpch.get-year@1[
+  FunctionCall asterix.get-year@1[
     FieldAccessor [
       Variable [ Name=$locs ]
       Field=l_shipdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
index 148fe1d..30243af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
@@ -450,7 +450,7 @@
     ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$slnrcop ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
index 683f2f2..52159a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
@@ -344,7 +344,7 @@
         ]
         Where
           OperatorExpr [
-            FunctionCall tpch.contains@2[
+            FunctionCall asterix.contains@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_name
@@ -400,7 +400,7 @@
       ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
index 8ae41ce..872bfc4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
@@ -11,7 +11,7 @@
       (
         LiteralExpr [STRING] [total_revenue]
         :
-        FunctionCall asterix.sum@1[
+        FunctionCall tpch.STRICT_SUM@1[
           (
             SELECT ELEMENT [
             OperatorExpr [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
index de332e6..61d2e5e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
@@ -14,7 +14,7 @@
         OperatorExpr [
           LiteralExpr [DOUBLE] [0.2]
           *
-          FunctionCall asterix.avg@1[
+          FunctionCall tpch.strict_avg@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 3314c43..0ceadd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -56,7 +56,7 @@
               LiteralExpr [STRING] [Brand#12]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -100,7 +100,7 @@
               LiteralExpr [LONG] [5]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
@@ -128,7 +128,7 @@
               LiteralExpr [STRING] [Brand#23]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -172,7 +172,7 @@
               LiteralExpr [LONG] [10]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
@@ -200,7 +200,7 @@
               LiteralExpr [STRING] [Brand#34]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -244,7 +244,7 @@
               LiteralExpr [LONG] [15]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index 4b1fa29..06a76d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -11,7 +11,7 @@
       (
         LiteralExpr [STRING] [count_suppkey]
         :
-        FunctionCall asterix.count@1[
+        FunctionCall tpch.strict_count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -38,7 +38,7 @@
       (
         LiteralExpr [STRING] [max_suppkey]
         :
-        FunctionCall asterix.max@1[
+        FunctionCall tpch.strict_max@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -123,7 +123,7 @@
       (
         LiteralExpr [STRING] [count_suppkey]
         :
-        FunctionCall asterix.count@1[
+        FunctionCall tpch.strict_count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -150,7 +150,7 @@
       (
         LiteralExpr [STRING] [max_suppkey]
         :
-        FunctionCall asterix.max@1[
+        FunctionCall tpch.strict_max@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 7474a00..4df5c9e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -22,7 +22,7 @@
       (
         LiteralExpr [STRING] [cntrycode]
         :
-        FunctionCall tpch.substring@3[
+        FunctionCall tpch.SUBSTR@3[
           FieldAccessor [
             Variable [ Name=$c ]
             Field=c_phone
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
index 7dd2855..0f2d9c4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
@@ -344,7 +344,7 @@
         ]
         Where
           OperatorExpr [
-            FunctionCall tpch.contains@2[
+            FunctionCall asterix.contains@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_name
@@ -400,7 +400,7 @@
       ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
index 162701b..e715133 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.ast
@@ -337,7 +337,7 @@
       (
         LiteralExpr [STRING] [ps_min_supplycost]
         :
-        FunctionCall asterix.min@1[
+        FunctionCall tpch.STRICT_MIN@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
index 4de6f4e..1d4ed44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
@@ -317,7 +317,7 @@
 ]
 Let Variable [ Name=$l_year0 ]
   :=
-  FunctionCall tpch.get-year@1[
+  FunctionCall asterix.get-year@1[
     FieldAccessor [
       Variable [ Name=$locs ]
       Field=l_shipdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
index 979a913..26016cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
@@ -464,7 +464,7 @@
     ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$slnrcop ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
index 6d23830..a2db84b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
@@ -350,7 +350,7 @@
             AS Variable [ Name=$l2 ]
             ON
             OperatorExpr [
-              FunctionCall tpch.contains@2[
+              FunctionCall asterix.contains@2[
                 FieldAccessor [
                   Variable [ Name=$p ]
                   Field=p_name
@@ -407,7 +407,7 @@
       ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
index 8ae41ce..872bfc4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
@@ -11,7 +11,7 @@
       (
         LiteralExpr [STRING] [total_revenue]
         :
-        FunctionCall asterix.sum@1[
+        FunctionCall tpch.STRICT_SUM@1[
           (
             SELECT ELEMENT [
             OperatorExpr [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 3314c43..0ceadd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -56,7 +56,7 @@
               LiteralExpr [STRING] [Brand#12]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -100,7 +100,7 @@
               LiteralExpr [LONG] [5]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
@@ -128,7 +128,7 @@
               LiteralExpr [STRING] [Brand#23]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -172,7 +172,7 @@
               LiteralExpr [LONG] [10]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
@@ -200,7 +200,7 @@
               LiteralExpr [STRING] [Brand#34]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_container
@@ -244,7 +244,7 @@
               LiteralExpr [LONG] [15]
             ]
             and
-            FunctionCall tpch.matches@2[
+            FunctionCall asterix.matches@2[
               FieldAccessor [
                 Variable [ Name=$l ]
                 Field=l_shipmode
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index 4b1fa29..06a76d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -11,7 +11,7 @@
       (
         LiteralExpr [STRING] [count_suppkey]
         :
-        FunctionCall asterix.count@1[
+        FunctionCall tpch.strict_count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -38,7 +38,7 @@
       (
         LiteralExpr [STRING] [max_suppkey]
         :
-        FunctionCall asterix.max@1[
+        FunctionCall tpch.strict_max@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -123,7 +123,7 @@
       (
         LiteralExpr [STRING] [count_suppkey]
         :
-        FunctionCall asterix.count@1[
+        FunctionCall tpch.strict_count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
@@ -150,7 +150,7 @@
       (
         LiteralExpr [STRING] [max_suppkey]
         :
-        FunctionCall asterix.max@1[
+        FunctionCall tpch.strict_max@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 7474a00..4df5c9e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -22,7 +22,7 @@
       (
         LiteralExpr [STRING] [cntrycode]
         :
-        FunctionCall tpch.substring@3[
+        FunctionCall tpch.SUBSTR@3[
           FieldAccessor [
             Variable [ Name=$c ]
             Field=c_phone
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
index 6dce02e..7fd66dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
@@ -104,7 +104,7 @@
       ]
       Let Variable [ Name=$phone_substr ]
         :=
-        FunctionCall tpch.substring@3[
+        FunctionCall asterix.substring@3[
           FieldAccessor [
             Variable [ Name=$c ]
             Field=c_phone
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
index 7dd2855..0f2d9c4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
@@ -344,7 +344,7 @@
         ]
         Where
           OperatorExpr [
-            FunctionCall tpch.contains@2[
+            FunctionCall asterix.contains@2[
               FieldAccessor [
                 Variable [ Name=$p ]
                 Field=p_name
@@ -400,7 +400,7 @@
       ]
     Let Variable [ Name=$o_year ]
       :=
-      FunctionCall tpch.get-year@1[
+      FunctionCall asterix.get-year@1[
         FieldAccessor [
           Variable [ Name=$o ]
           Field=o_orderdate
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
index fe649d3..6ff3869 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
index 50c76b7..26b7b66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
index eccf7e9..85759ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
index 2c542a9..8dcc843 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
index 22095c4..73fa45b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
index 2c542a9..8dcc843 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
@@ -32,7 +32,7 @@
       Field=age
     ]
     =
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
index 8245e3f..8e6b404 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
@@ -32,7 +32,7 @@
       Field=worksince
     ]
     =
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [2001]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
index 41f6c6c..47a8bd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
@@ -32,7 +32,7 @@
       Field=worksince
     ]
     =
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [2001]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
index 09dbd79..bef4e53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
@@ -32,7 +32,7 @@
       Field=worksince
     ]
     =
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [2001]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
index 1c1aa07..f4ce0de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
@@ -32,7 +32,7 @@
       Field=worksince
     ]
     =
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [2001]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
index dbbce3a..2c8499a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
@@ -32,7 +32,7 @@
       Field=worksince
     ]
     =
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [2001]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
index d3f9a59..4b7c66e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.int8@1[
+    FunctionCall asterix.int8@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
index 02a69df..3612d89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.int16@1[
+    FunctionCall asterix.int16@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
index d2fddef..8a2016e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.int32@1[
+    FunctionCall asterix.int32@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
index f0a7742..b74cf5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.int64@1[
+    FunctionCall asterix.int64@1[
       LiteralExpr [STRING] [1]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
index dfbe5db..9c049be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.float@1[
+    FunctionCall asterix.float@1[
       LiteralExpr [STRING] [1.0]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
index 38e4915..a616718 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.double@1[
+    FunctionCall asterix.double@1[
       LiteralExpr [STRING] [1.0]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
index b6ab37e..ddc32ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
@@ -32,7 +32,7 @@
       Field=supvrid
     ]
     =
-    FunctionCall test.point@1[
+    FunctionCall asterix.point@1[
       LiteralExpr [STRING] [80.10d, -10E5]
     ]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/f01/f01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/f01/f01.3.ast
index 0b153e1..9245cca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/f01/f01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/f01/f01.3.ast
@@ -1,4 +1,4 @@
 DataverseUse test
 Query:
-FunctionCall test.tinyint@0[
+FunctionCall asterix.tinyint@0[
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/invoke-private-function/invoke-private-function.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/invoke-private-function/invoke-private-function.3.ast
index 259fce4..3808e5e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/invoke-private-function/invoke-private-function.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/invoke-private-function/invoke-private-function.3.ast
@@ -91,35 +91,35 @@
 Let Variable [ Name=$results ]
   :=
   OrderedListConstructor [
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$a ]
       Variable [ Name=$b ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$b ]
       Variable [ Name=$a ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$c ]
       Variable [ Name=$d ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$d ]
       Variable [ Name=$c ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$e ]
       Variable [ Name=$f ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$f ]
       Variable [ Name=$e ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$g ]
       Variable [ Name=$h ]
     ]
-    FunctionCall test.similarity-jaccard@2[
+    FunctionCall asterix.similarity-jaccard@2[
       Variable [ Name=$h ]
       Variable [ Name=$g ]
     ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue172/query-issue172.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue172/query-issue172.3.ast
index 0246049..0b6182d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue172/query-issue172.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue172/query-issue172.3.ast
@@ -1,6 +1,6 @@
 Query:
-FunctionCall null.string-length@1[
-  FunctionCall null.string-concat@1[
+FunctionCall asterix.string-length@1[
+  FunctionCall asterix.string-concat@1[
     OrderedListConstructor [
       LiteralExpr [STRING] [this is a ]
       LiteralExpr [STRING] [test string]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue201/query-issue201.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue201/query-issue201.3.ast
index 5560bd3..3ab1947 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue201/query-issue201.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue201/query-issue201.3.ast
@@ -2,7 +2,7 @@
 Query:
 Let Variable [ Name=$x ]
   :=
-  FunctionCall null.range@2[
+  FunctionCall asterix.range@2[
     LiteralExpr [LONG] [1]
     LiteralExpr [LONG] [100]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf16/udf16.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf16/udf16.3.ast
index e095df3..61af8ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf16/udf16.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf16/udf16.3.ast
@@ -1,6 +1,6 @@
 DataverseUse test
 Query:
-FunctionCall test.string-length@1[
+FunctionCall asterix.string-length@1[
   FunctionCall test.fn02@0[
   ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.3.ast
index 528b379..d5f1993 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.3.ast
@@ -14,12 +14,12 @@
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=#2 ]
+      Variable [ Name=#4 ]
       Field=rank_result_delta
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#2 ]
+      AS Variable [ Name=#4 ]
     ]
   )
 ]
@@ -28,12 +28,12 @@
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=#3 ]
+      Variable [ Name=#5 ]
       Field=rank_result_delta
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#3 ]
+      AS Variable [ Name=#5 ]
     ]
   )
 ]
@@ -42,12 +42,12 @@
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=#4 ]
+      Variable [ Name=#6 ]
       Field=percent_rank_result_delta
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#4 ]
+      AS Variable [ Name=#6 ]
     ]
   )
 ]
@@ -56,12 +56,12 @@
   (
     SELECT ELEMENT [
     FieldAccessor [
-      Variable [ Name=#5 ]
+      Variable [ Name=#7 ]
       Field=percent_rank_result_delta
     ]
     ]
     FROM [      Variable [ Name=#1 ]
-      AS Variable [ Name=#5 ]
+      AS Variable [ Name=#7 ]
     ]
   )
 ]
@@ -72,7 +72,7 @@
   ]
   AS Variable [ Name=$t1 ]
 ,
-  FunctionCall test.range@2[
+  FunctionCall asterix.range@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=one
@@ -81,7 +81,7 @@
   ]
   AS Variable [ Name=$p ]
 ,
-  FunctionCall test.range@2[
+  FunctionCall asterix.range@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=one
@@ -90,7 +90,7 @@
   ]
   AS Variable [ Name=$n ]
 ,
-  FunctionCall test.range@2[
+  FunctionCall asterix.range@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=one
@@ -116,8 +116,16 @@
   ]
 Let Variable [ Name=$rank_result_actual ]
   :=
-  WINDOW test.rank@0[
+  WINDOW asterix.rank-impl@-1[
   ]
+    AS Variable [ Name=#2 ]
+    (
+      t1:=Variable [ Name=$t1 ]
+      p:=Variable [ Name=$p ]
+      n:=Variable [ Name=$n ]
+      d:=Variable [ Name=$d ]
+      rank_result_expected:=Variable [ Name=$rank_result_expected ]
+    )
   OVER (
     PARTITION BY
       FieldAccessor [
@@ -157,8 +165,19 @@
   ]
 Let Variable [ Name=$percent_rank_result_actual ]
   :=
-  WINDOW test.percent_rank@0[
+  WINDOW asterix.percent-rank-impl@-1[
   ]
+    AS Variable [ Name=#3 ]
+    (
+      t1:=Variable [ Name=$t1 ]
+      p:=Variable [ Name=$p ]
+      n:=Variable [ Name=$n ]
+      d:=Variable [ Name=$d ]
+      rank_result_expected:=Variable [ Name=$rank_result_expected ]
+      rank_result_actual:=Variable [ Name=$rank_result_actual ]
+      rank_result_delta:=Variable [ Name=$rank_result_delta ]
+      percent_rank_result_expected:=Variable [ Name=$percent_rank_result_expected ]
+    )
   OVER (
     PARTITION BY
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.4.ast
index 7330fe9..1bb139c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.4.ast
@@ -6,8 +6,14 @@
 SELECT [
 Variable [ Name=$p ]
 p
-WINDOW test.row_number@0[
+WINDOW asterix.row-number-impl@0[
 ]
+  AS Variable [ Name=#2 ]
+  (
+    p:=Variable [ Name=$p ]
+    p:=Variable [ Name=$p ]
+    #1:=Variable [ Name=#1 ]
+  )
 OVER (
   ORDER BY
     Variable [ Name=$p ]
@@ -20,7 +26,7 @@
   ]
   AS Variable [ Name=$t1 ]
 ,
-  FunctionCall test.range@2[
+  FunctionCall asterix.range@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=one
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.5.ast
index cfad0ae..b8a9f3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.5.ast
@@ -16,8 +16,12 @@
     Field=c1
   ]
   c1
-  WINDOW test.row_number@0[
+  WINDOW asterix.row-number-impl@0[
   ]
+    AS Variable [ Name=#1 ]
+    (
+      g:=Variable [ Name=$g ]
+    )
   OVER (
     ORDER BY
       FieldAccessor [
@@ -52,7 +56,7 @@
   ]
   AS Variable [ Name=$t1 ]
 ,
-  FunctionCall test.range@2[
+  FunctionCall asterix.range@2[
     FieldAccessor [
       Variable [ Name=$t1 ]
       Field=one
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.6.ast
index b9f6792..094fbd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.6.ast
@@ -6,7 +6,7 @@
   Field=c1
 ]
 c1
-WINDOW test.array_sum@1[
+WINDOW asterix.sql-sum@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -23,6 +23,9 @@
   )
 ]
   AS Variable [ Name=$w ]
+  (
+    t1:=Variable [ Name=$t1 ]
+  )
 OVER (
   PARTITION BY
     OperatorExpr [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.7.ast
index 2271af5..4aed6da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.7.ast
@@ -4,13 +4,26 @@
 m
 Variable [ Name=$t ]
 t
-WINDOW null.sum@1[
-  OperatorExpr [
-    Variable [ Name=$t ]
-    mod
-    LiteralExpr [LONG] [4]
-  ]
+WINDOW asterix.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      Variable [ Name=#5 ]
+      Field=#2
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#5 ]
+    ]
+  )
 ]
+  AS Variable [ Name=#1 ]
+  (
+    t:=Variable [ Name=$t ]
+    m:=Variable [ Name=$m ]
+    #2:=Variable [ Name=#2 ]
+    #4:=Variable [ Name=#4 ]
+  )
 OVER (
   PARTITION BY
     Variable [ Name=$m ]
@@ -20,13 +33,26 @@
   rows between unbounded preceding and current row exclude no others
 )
 sum
-WINDOW null.sum-distinct@1[
-  OperatorExpr [
-    Variable [ Name=$t ]
-    mod
-    LiteralExpr [LONG] [4]
-  ]
+WINDOW asterix.sql-sum-distinct@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      Variable [ Name=#6 ]
+      Field=#4
+    ]
+    ]
+    FROM [      Variable [ Name=#3 ]
+      AS Variable [ Name=#6 ]
+    ]
+  )
 ]
+  AS Variable [ Name=#3 ]
+  (
+    t:=Variable [ Name=$t ]
+    m:=Variable [ Name=$m ]
+    #2:=Variable [ Name=#2 ]
+    #4:=Variable [ Name=#4 ]
+  )
 OVER (
   PARTITION BY
     Variable [ Name=$m ]
@@ -37,7 +63,7 @@
 )
 sum_distinct
 ]
-FROM [  FunctionCall null.range@2[
+FROM [  FunctionCall asterix.range@2[
     LiteralExpr [LONG] [1]
     LiteralExpr [LONG] [20]
   ]
@@ -50,6 +76,20 @@
     mod
     LiteralExpr [LONG] [4]
   ]
+Let Variable [ Name=#2 ]
+  :=
+  OperatorExpr [
+    Variable [ Name=$t ]
+    mod
+    LiteralExpr [LONG] [4]
+  ]
+Let Variable [ Name=#4 ]
+  :=
+  OperatorExpr [
+    Variable [ Name=$t ]
+    mod
+    LiteralExpr [LONG] [4]
+  ]
 Orderby
   Variable [ Name=$m ]
   ASC
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.8.ast
index 6204b11..115334b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.8.ast
@@ -2,19 +2,22 @@
 SELECT [
 Variable [ Name=$x ]
 x
-WINDOW null.array_sum@1[
-  FunctionCall null.to-array@1[
+WINDOW asterix.sql-sum@1[
+  FunctionCall asterix.to-array@1[
     FunctionCall asterix.sql-count@1[
       Variable [ Name=$w ]
     ]
   ]
 ]
   AS Variable [ Name=$w ]
+  (
+    x:=Variable [ Name=$x ]
+  )
 OVER (
 )
 sum
 ]
-FROM [  FunctionCall null.range@2[
+FROM [  FunctionCall asterix.range@2[
     LiteralExpr [LONG] [1]
     LiteralExpr [LONG] [4]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.9.ast
index ebedcaa..b3b78f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.9.ast
@@ -2,7 +2,7 @@
 SELECT ELEMENT [
 Variable [ Name=$x ]
 ]
-FROM [  FunctionCall null.range@2[
+FROM [  FunctionCall asterix.range@2[
     LiteralExpr [LONG] [1]
     LiteralExpr [LONG] [10]
   ]
@@ -11,8 +11,8 @@
 Where
   OperatorExpr [
     OperatorExpr [
-      FunctionCall null.to-bigint@1[
-        FunctionCall null.to-double@1[
+      FunctionCall asterix.to-bigint@1[
+        FunctionCall asterix.to-double@1[
           Variable [ Name=$x ]
         ]
       ]
@@ -21,9 +21,23 @@
     ]
     and
     OperatorExpr [
-      WINDOW null.sum@1[
-        Variable [ Name=$x ]
+      WINDOW asterix.sql-sum@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            Variable [ Name=#3 ]
+            Field=x
+          ]
+          ]
+          FROM [            Variable [ Name=#1 ]
+            AS Variable [ Name=#3 ]
+          ]
+        )
       ]
+        AS Variable [ Name=#1 ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       =
@@ -37,12 +51,26 @@
     ]
     and
     OperatorExpr [
-      WINDOW null.count@1[
-        Variable [ Name=$x ]
+      WINDOW asterix.sql-count@1[
+        (
+          SELECT ELEMENT [
+          FieldAccessor [
+            Variable [ Name=#4 ]
+            Field=x
+          ]
+          ]
+          FROM [            Variable [ Name=#2 ]
+            AS Variable [ Name=#4 ]
+          ]
+        )
       ]
+        AS Variable [ Name=#2 ]
+        (
+          x:=Variable [ Name=$x ]
+        )
       OVER (
       )
       =
       LiteralExpr [LONG] [10]
     ]
-  ]
\ No newline at end of file
+  ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 4b2a209..1e11bb8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -2843,7 +2843,7 @@
     <test-case FilePath="aggregate-sql-sugar">
       <compilation-unit name="array_agg_negative">
         <output-dir compare="Text">array_agg</output-dir>
-        <expected-error>ASX1079: Compilation error: array_agg is a SQL-92 aggregate function. The SQL++ core aggregate function strict_arrayagg could potentially express the intent.</expected-error>
+        <expected-error>ASX1079: Compilation error: arrayagg is a SQL-92 aggregate function. The SQL++ core aggregate function strict_arrayagg could potentially express the intent.</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="aggregate-sql-sugar">
@@ -3013,7 +3013,7 @@
     <test-case FilePath="array_fun">
       <compilation-unit name="array_slice/array_slice_exception_result">
         <output-dir compare="Text">array_slice/array_slice_exception_result</output-dir>
-        <expected-error>Compilation error</expected-error>
+        <expected-error>ASX1081: Cannot find function with name TinySocial.array_slice@0</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="array_fun">
@@ -5393,7 +5393,7 @@
     <test-case FilePath="global-aggregate">
       <compilation-unit name="q07_error">
         <output-dir compare="Text">q01</output-dir>
-        <expected-error>COUNT is a SQL-92 aggregate function. The SQL++ core aggregate function array_count could potentially express the intent.</expected-error>
+        <expected-error>count is a SQL-92 aggregate function. The SQL++ core aggregate function array_count could potentially express the intent.</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="global-aggregate">
@@ -5602,16 +5602,6 @@
       </compilation-unit>
     </test-case>
     <test-case FilePath="group-by">
-      <compilation-unit name="gby-expr-2">
-        <output-dir compare="Text">gby-expr-2</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="group-by">
-      <compilation-unit name="gby-expr-3">
-        <output-dir compare="Text">gby-expr-3</output-dir>
-      </compilation-unit>
-    </test-case>
-    <test-case FilePath="group-by">
       <compilation-unit name="grouping-sets-1">
         <output-dir compare="Text">grouping-sets-1</output-dir>
       </compilation-unit>
@@ -11697,13 +11687,13 @@
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="bad-function-ddl-5">
         <output-dir compare="Text">bad-function-ddl-5</output-dir>
-        <expected-error>function experiments.function_that_does_not_exist@0 is not defined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name experiments.function_that_does_not_exist@0</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="bad-function-ddl-6">
         <output-dir compare="Text">bad-function-ddl-6</output-dir>
-        <expected-error>function experiments.function_that_does_not_exist@2 is not defined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name experiments.function_that_does_not_exist@2</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
@@ -11721,13 +11711,13 @@
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="bad-function-ddl-9">
         <output-dir compare="Text">bad-function-ddl-9</output-dir>
-        <expected-error>function experiments.function_that_does_not_exist@0 which is undefined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name experiments.function_that_does_not_exist@0</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="bad-function-ddl-10">
         <output-dir compare="Text">bad-function-ddl-10</output-dir>
-        <expected-error>function experiments.f0@2 which is undefined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name experiments.f0@2</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
@@ -11797,7 +11787,7 @@
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="query-ASTERIXDB-1652">
         <output-dir compare="Text">query-ASTERIXDB-1652-2</output-dir>
-        <expected-error>In function call "test.length(...)", the dataverse "test" cannot be found!</expected-error>
+        <expected-error>ASX1063: Cannot find dataverse with name test</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
@@ -11828,7 +11818,7 @@
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="query-issue455">
         <output-dir compare="Text">query-issue455</output-dir>
-        <expected-error>function test.printName@0 is not defined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name test.printName@0</expected-error>
       </compilation-unit>
     </test-case>
     <test-case FilePath="user-defined-functions">
@@ -11996,7 +11986,7 @@
     <test-case FilePath="user-defined-functions">
       <compilation-unit name="f01">
         <output-dir compare="Text">f01</output-dir>
-        <expected-error>function test.tinyint@0 is not defined</expected-error>
+        <expected-error>ASX1081: Cannot find function with name test.tinyint@0</expected-error>
       </compilation-unit>
     </test-case>
     <!-- This test case is not valid anymore since we do not required "IMPORT_PRIVATE_FUNCTIONS" flag anymore -->
@@ -14277,7 +14267,7 @@
         <expected-error>ASX0002: Type mismatch</expected-error>
         <expected-error>ASX1104: Invalid modifier FROM FIRST/LAST for function</expected-error>
         <expected-error>ASX1037: Invalid query parameter compiler.windowmemory</expected-error>
-        <expected-error>ASX1102: Expected window or aggregate function, got: unknown_func</expected-error>
+        <expected-error>ASX1102: Expected window or aggregate function, got: lowercase</expected-error>
         <expected-error>ASX1079: Compilation error: count is a SQL-92 aggregate function</expected-error>
         <expected-error>ASX1104: Invalid modifier RESPECT/IGNORE NULLS for function</expected-error>
         <expected-error>ASX1104: Invalid modifier RESPECT/IGNORE NULLS for function</expected-error>
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index b277d8f..73dfbd4 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -211,6 +211,7 @@
     public static final int COMPILATION_GROUPING_OPERATION_INVALID_ARG = 1119;
     public static final int COMPILATION_UNEXPECTED_ALIAS = 1120;
     public static final int COMPILATION_ILLEGAL_USE_OF_FILTER_CLAUSE = 1121;
+    public static final int COMPILATION_BAD_FUNCTION_DEFINITION = 1122;
 
     // Feed errors
     public static final int DATAFLOW_ILLEGAL_STATE = 3001;
diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index 426c592..a7d49d9 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -206,6 +206,7 @@
 1119 = Invalid argument to grouping() function
 1120 = Unexpected alias: %1$s
 1121 = Illegal use of aggregate FILTER clause
+1122 = Error compiling function %1$s. %2$s
 
 # Feed Errors
 3001 = Illegal state.
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriter.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriter.java
new file mode 100644
index 0000000..e8b6747
--- /dev/null
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriter.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.lang.aql.rewrites;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.IParserFactory;
+import org.apache.asterix.lang.common.base.IReturningStatement;
+import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
+import org.apache.asterix.lang.common.statement.FunctionDecl;
+import org.apache.asterix.lang.common.struct.VarIdentifier;
+import org.apache.asterix.metadata.declared.MetadataProvider;
+
+public final class AqlFunctionBodyRewriter extends AqlQueryRewriter {
+
+    public AqlFunctionBodyRewriter(IParserFactory parserFactory) {
+        super(parserFactory);
+    }
+
+    @Override
+    public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement,
+            MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs,
+            Collection<VarIdentifier> externalVars) throws CompilationException {
+        setup(declaredFunctions, topStatement, metadataProvider, context);
+        resolveFunctionCalls();
+        inlineDeclaredUdfs();
+    }
+}
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriterFactory.java
similarity index 80%
copy from asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java
copy to asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriterFactory.java
index 0987d89..f14eef9 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlFunctionBodyRewriterFactory.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.asterix.lang.aql.rewrites;
 
 import org.apache.asterix.lang.common.base.IParserFactory;
@@ -23,22 +24,21 @@
 import org.apache.asterix.lang.common.base.IRewriterFactory;
 import org.apache.asterix.lang.common.base.IStatementRewriter;
 
-public class AQLRewriterFactory implements IRewriterFactory {
+public final class AqlFunctionBodyRewriterFactory implements IRewriterFactory {
 
     private final IParserFactory parserFactory;
 
-    public AQLRewriterFactory(IParserFactory parserFactory) {
+    public AqlFunctionBodyRewriterFactory(IParserFactory parserFactory) {
         this.parserFactory = parserFactory;
     }
 
     @Override
     public IQueryRewriter createQueryRewriter() {
-        return new AqlQueryRewriter(parserFactory);
+        return new AqlFunctionBodyRewriter(parserFactory);
     }
 
     @Override
     public IStatementRewriter createStatementRewriter() {
-        return new AqlStatementRewriter();
+        throw new IllegalStateException("There could not be non-query statements inside a function definition.");
     }
-
 }
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java
index 369d4c2..53893cb 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java
@@ -30,7 +30,7 @@
 import org.apache.asterix.lang.aql.clause.ForClause;
 import org.apache.asterix.lang.aql.expression.FLWOGRExpression;
 import org.apache.asterix.lang.aql.expression.UnionExpr;
-import org.apache.asterix.lang.aql.rewrites.visitor.AqlBuiltinFunctionRewriteVisitor;
+import org.apache.asterix.lang.aql.rewrites.visitor.AqlFunctionCallResolverVisitor;
 import org.apache.asterix.lang.aql.visitor.AQLInlineUdfsVisitor;
 import org.apache.asterix.lang.aql.visitor.base.IAQLVisitor;
 import org.apache.asterix.lang.common.base.Clause;
@@ -49,7 +49,6 @@
 import org.apache.asterix.lang.common.statement.FunctionDecl;
 import org.apache.asterix.lang.common.struct.Identifier;
 import org.apache.asterix.lang.common.struct.VarIdentifier;
-import org.apache.asterix.lang.common.util.CommonFunctionMapUtil;
 import org.apache.asterix.lang.common.util.FunctionUtil;
 import org.apache.asterix.lang.common.visitor.GatherFunctionCallsVisitor;
 import org.apache.asterix.metadata.declared.MetadataProvider;
@@ -69,7 +68,7 @@
         functionParser = new FunctionParser(parserFactory);
     }
 
-    private void setup(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement,
+    protected void setup(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement,
             MetadataProvider metadataProvider, LangRewritingContext context) {
         this.topStatement = topStatement;
         this.context = context;
@@ -85,12 +84,12 @@
         if (topStatement.isTopLevel()) {
             wrapInLets();
         }
+        resolveFunctionCalls();
         inlineDeclaredUdfs();
-        rewriteFunctionName();
         topStatement.setVarCounter(context.getVarCounter().get());
     }
 
-    private void wrapInLets() {
+    protected void wrapInLets() {
         // If the top expression of the main statement is not a FLWOR, it wraps
         // it into a let clause.
         if (topStatement == null) {
@@ -108,15 +107,16 @@
         }
     }
 
-    private void rewriteFunctionName() throws CompilationException {
+    protected void resolveFunctionCalls() throws CompilationException {
         if (topStatement == null) {
             return;
         }
-        AqlBuiltinFunctionRewriteVisitor visitor = new AqlBuiltinFunctionRewriteVisitor();
+        AqlFunctionCallResolverVisitor visitor =
+                new AqlFunctionCallResolverVisitor(metadataProvider, declaredFunctions);
         topStatement.accept(visitor, null);
     }
 
-    private void inlineDeclaredUdfs() throws CompilationException {
+    protected void inlineDeclaredUdfs() throws CompilationException {
         if (topStatement == null) {
             return;
         }
@@ -128,13 +128,12 @@
         List<FunctionDecl> storedFunctionDecls = new ArrayList<>();
         for (Expression topLevelExpr : topStatement.getDirectlyEnclosedExpressions()) {
             storedFunctionDecls.addAll(FunctionUtil.retrieveUsedStoredFunctions(metadataProvider, topLevelExpr, funIds,
-                    null, expr -> getFunctionCalls(expr), functionParser,
-                    (signature, sourceLoc) -> CommonFunctionMapUtil.normalizeBuiltinFunctionSignature(signature)));
+                    null, this::getFunctionCalls, functionParser, metadataProvider.getDefaultDataverseName()));
             declaredFunctions.addAll(storedFunctionDecls);
         }
         if (!declaredFunctions.isEmpty()) {
-            AQLInlineUdfsVisitor visitor = new AQLInlineUdfsVisitor(context, new AQLRewriterFactory(parserFactory),
-                    declaredFunctions, metadataProvider);
+            AQLInlineUdfsVisitor visitor = new AQLInlineUdfsVisitor(context,
+                    new AqlFunctionBodyRewriterFactory(parserFactory), declaredFunctions, metadataProvider);
             while (topStatement.accept(visitor, declaredFunctions)) {
                 // loop until no more changes
             }
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlRewriterFactory.java
similarity index 92%
rename from asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java
rename to asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlRewriterFactory.java
index 0987d89..c0ce3d3 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AQLRewriterFactory.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlRewriterFactory.java
@@ -23,11 +23,11 @@
 import org.apache.asterix.lang.common.base.IRewriterFactory;
 import org.apache.asterix.lang.common.base.IStatementRewriter;
 
-public class AQLRewriterFactory implements IRewriterFactory {
+public class AqlRewriterFactory implements IRewriterFactory {
 
     private final IParserFactory parserFactory;
 
-    public AQLRewriterFactory(IParserFactory parserFactory) {
+    public AqlRewriterFactory(IParserFactory parserFactory) {
         this.parserFactory = parserFactory;
     }
 
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlBuiltinFunctionRewriteVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlBuiltinFunctionRewriteVisitor.java
deleted file mode 100644
index 5b52ef5..0000000
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlBuiltinFunctionRewriteVisitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.lang.aql.rewrites.visitor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.asterix.lang.aql.visitor.base.AbstractAqlSimpleExpressionVisitor;
-import org.apache.asterix.lang.common.base.Expression;
-import org.apache.asterix.lang.common.base.ILangExpression;
-import org.apache.asterix.lang.common.expression.CallExpr;
-import org.apache.asterix.lang.common.util.CommonFunctionMapUtil;
-
-public class AqlBuiltinFunctionRewriteVisitor extends AbstractAqlSimpleExpressionVisitor {
-
-    @Override
-    public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
-        FunctionSignature functionSignature = callExpr.getFunctionSignature();
-        callExpr.setFunctionSignature(CommonFunctionMapUtil.normalizeBuiltinFunctionSignature(functionSignature));
-        List<Expression> newExprList = new ArrayList<>();
-        for (Expression expr : callExpr.getExprList()) {
-            newExprList.add(expr.accept(this, arg));
-        }
-        callExpr.setExprList(newExprList);
-        if (callExpr.hasAggregateFilterExpr()) {
-            callExpr.setAggregateFilterExpr(callExpr.getAggregateFilterExpr().accept(this, arg));
-        }
-        return callExpr;
-    }
-}
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlFunctionCallResolverVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlFunctionCallResolverVisitor.java
new file mode 100644
index 0000000..71c26f2
--- /dev/null
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/visitor/AqlFunctionCallResolverVisitor.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.lang.aql.rewrites.visitor;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.lang.aql.visitor.base.AbstractAqlSimpleExpressionVisitor;
+import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.ILangExpression;
+import org.apache.asterix.lang.common.expression.CallExpr;
+import org.apache.asterix.lang.common.statement.FunctionDecl;
+import org.apache.asterix.lang.common.util.FunctionUtil;
+import org.apache.asterix.metadata.declared.MetadataProvider;
+
+public final class AqlFunctionCallResolverVisitor extends AbstractAqlSimpleExpressionVisitor {
+
+    private final MetadataProvider metadataProvider;
+
+    private final Set<FunctionSignature> declaredFunctions;
+
+    private final BiFunction<String, Integer, FunctionSignature> callExprResolver;
+
+    public AqlFunctionCallResolverVisitor(MetadataProvider metadataProvider, List<FunctionDecl> declaredFunctions) {
+        this.metadataProvider = metadataProvider;
+        this.declaredFunctions = FunctionUtil.getFunctionSignatures(declaredFunctions);
+        this.callExprResolver = FunctionUtil.createBuiltinFunctionResolver(metadataProvider);
+    }
+
+    @Override
+    public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
+        FunctionSignature fs = FunctionUtil.resolveFunctionCall(callExpr.getFunctionSignature(),
+                callExpr.getSourceLocation(), metadataProvider, declaredFunctions, callExprResolver);
+        callExpr.setFunctionSignature(fs);
+        return super.visit(callExpr, arg);
+    }
+}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/parser/FunctionParser.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/parser/FunctionParser.java
index fec4f50..52f8a16 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/parser/FunctionParser.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/parser/FunctionParser.java
@@ -46,6 +46,11 @@
                     function.getLanguage());
         }
         IParser parser = parserFactory.createParser(new StringReader(function.getFunctionBody()));
-        return parser.parseFunctionBody(function.getSignature(), function.getParameterNames());
+        try {
+            return parser.parseFunctionBody(function.getSignature(), function.getParameterNames());
+        } catch (CompilationException e) {
+            throw new CompilationException(ErrorCode.COMPILATION_BAD_FUNCTION_DEFINITION, e, function.getSignature(),
+                    e.getMessage());
+        }
     }
 }
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
index 0d74272..28a50b1 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
@@ -22,9 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.asterix.om.functions.BuiltinFunctions;
-
 public class CommonFunctionMapUtil {
 
     // Maps from a function name to an another internal function name (i.e., AsterixDB internal name).
@@ -174,26 +171,6 @@
 
     }
 
-    /**
-     * Maps a user invoked function signature to a builtin internal function signature if possible.
-     *
-     * @param fs,
-     *            the signature of an user typed function.
-     * @return the corresponding system internal function signature if it exists, otherwise
-     *         the input function signature.
-     */
-    public static FunctionSignature normalizeBuiltinFunctionSignature(FunctionSignature fs) {
-        String name = fs.getName();
-        String lowerCaseName = name.toLowerCase();
-        String mappedName = getFunctionMapping(lowerCaseName);
-        if (mappedName != null) {
-            return new FunctionSignature(fs.getDataverseName(), mappedName, fs.getArity());
-        }
-        String understoreName = lowerCaseName.replace('_', '-');
-        FunctionSignature newFs = new FunctionSignature(fs.getDataverseName(), understoreName, fs.getArity());
-        return BuiltinFunctions.isBuiltinCompilerFunction(newFs, true) ? newFs : fs;
-    }
-
     public static String getFunctionMapping(String alias) {
         return FUNCTION_NAME_MAP.get(alias);
     }
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
index 643d2a5..dee130c 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
@@ -22,9 +22,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.BiFunction;
 
 import org.apache.asterix.common.exceptions.CompilationException;
 import org.apache.asterix.common.exceptions.ErrorCode;
@@ -40,10 +42,9 @@
 import org.apache.asterix.lang.common.expression.UnorderedListTypeDefinition;
 import org.apache.asterix.lang.common.parser.FunctionParser;
 import org.apache.asterix.lang.common.statement.FunctionDecl;
-import org.apache.asterix.metadata.MetadataManager;
-import org.apache.asterix.metadata.MetadataTransactionContext;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.metadata.entities.BuiltinTypeMap;
+import org.apache.asterix.metadata.entities.Dataverse;
 import org.apache.asterix.metadata.entities.Function;
 import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.types.BuiltinType;
@@ -116,10 +117,69 @@
         Set<CallExpr> getFunctionCalls(Expression expression) throws CompilationException;
     }
 
-    @FunctionalInterface
-    public interface IFunctionNormalizer {
-        FunctionSignature normalizeBuiltinFunctionSignature(FunctionSignature fs, SourceLocation sourceLoc)
-                throws CompilationException;
+    public static FunctionSignature resolveFunctionCall(FunctionSignature fs, SourceLocation sourceLoc,
+            MetadataProvider metadataProvider, Set<FunctionSignature> declaredFunctions,
+            BiFunction<String, Integer, FunctionSignature> builtinFunctionResolver) throws CompilationException {
+        int arity = fs.getArity();
+        DataverseName dataverse = fs.getDataverseName();
+        if (dataverse == null) {
+            dataverse = metadataProvider.getDefaultDataverseName();
+        }
+        boolean isBuiltinFuncDataverse =
+                dataverse.equals(FunctionConstants.ASTERIX_DV) || dataverse.equals(FunctionConstants.ALGEBRICKS_DV);
+
+        if (!isBuiltinFuncDataverse) {
+            // attempt to resolve to a user-defined function
+            FunctionSignature fsWithDv =
+                    fs.getDataverseName() == null ? new FunctionSignature(dataverse, fs.getName(), arity) : fs;
+            if (declaredFunctions.contains(fsWithDv)) {
+                return fsWithDv;
+            }
+            try {
+                Function function = metadataProvider.lookupUserDefinedFunction(fsWithDv);
+                if (function != null) {
+                    return fsWithDv;
+                }
+            } catch (AlgebricksException e) {
+                throw new CompilationException(ErrorCode.COMPILATION_ERROR, e, sourceLoc, e.getMessage());
+            }
+
+            // fail if the dataverse was specified in the function call but this dataverse does not exist
+            if (fs.getDataverseName() != null) {
+                Dataverse dv;
+                try {
+                    dv = metadataProvider.findDataverse(dataverse);
+                } catch (AlgebricksException e) {
+                    throw new CompilationException(ErrorCode.COMPILATION_ERROR, e, sourceLoc, e.getMessage());
+                }
+                if (dv == null) {
+                    throw new CompilationException(ErrorCode.UNKNOWN_DATAVERSE, sourceLoc, dataverse);
+                }
+            }
+        }
+
+        // attempt to resolve to a built-in function
+        String name = fs.getName().toLowerCase();
+        String mappedName = CommonFunctionMapUtil.getFunctionMapping(name);
+        if (mappedName != null) {
+            name = mappedName;
+        }
+        FunctionSignature fsBuiltin = builtinFunctionResolver.apply(name, arity);
+        if (fsBuiltin == null) {
+            throw new CompilationException(ErrorCode.UNKNOWN_FUNCTION, sourceLoc, fs);
+        }
+        return fsBuiltin;
+    }
+
+    public static BiFunction<String, Integer, FunctionSignature> createBuiltinFunctionResolver(
+            MetadataProvider metadataProvider) {
+        boolean includePrivateFunctions = getImportPrivateFunctions(metadataProvider);
+        return (name, arity) -> {
+            String builtinName = name.replace('_', '-');
+            FunctionIdentifier builtinId =
+                    BuiltinFunctions.getBuiltinCompilerFunction(builtinName, arity, includePrivateFunctions);
+            return builtinId != null ? new FunctionSignature(builtinId) : null;
+        };
     }
 
     /**
@@ -137,80 +197,48 @@
      *            for collecting function calls in the <code>expression</code>
      * @param functionParser,
      *            for parsing stored functions in the string represetnation.
-     * @param functionNormalizer,
-     *            for normalizing function names.
+     * @param defaultDataverse
      * @throws CompilationException
      */
     public static List<FunctionDecl> retrieveUsedStoredFunctions(MetadataProvider metadataProvider,
             Expression expression, List<FunctionSignature> declaredFunctions, List<FunctionDecl> inputFunctionDecls,
-            IFunctionCollector functionCollector, FunctionParser functionParser, IFunctionNormalizer functionNormalizer)
+            IFunctionCollector functionCollector, FunctionParser functionParser, DataverseName defaultDataverse)
             throws CompilationException {
         List<FunctionDecl> functionDecls =
                 inputFunctionDecls == null ? new ArrayList<>() : new ArrayList<>(inputFunctionDecls);
         if (expression == null) {
             return functionDecls;
         }
-        String value = (String) metadataProvider.getConfig().get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS);
-        boolean includePrivateFunctions = (value != null) && Boolean.parseBoolean(value.toLowerCase());
         Set<CallExpr> functionCalls = functionCollector.getFunctionCalls(expression);
         for (CallExpr functionCall : functionCalls) {
-            FunctionSignature signature = functionCall.getFunctionSignature();
-            if (declaredFunctions != null && declaredFunctions.contains(signature)) {
+            FunctionSignature fs = functionCall.getFunctionSignature();
+            FunctionSignature fsWithDv = fs.getDataverseName() != null ? fs
+                    : new FunctionSignature(defaultDataverse, fs.getName(), fs.getArity());
+            if (declaredFunctions != null && declaredFunctions.contains(fsWithDv)) {
                 continue;
             }
-            if (signature.getDataverseName() == null) {
-                signature.setDataverseName(metadataProvider.getDefaultDataverseName());
-            }
-            DataverseName namespace = signature.getDataverseName();
-            // Checks the existence of the referred dataverse.
-            try {
-                if (!namespace.equals(FunctionConstants.ASTERIX_DV)
-                        && !namespace.equals(FunctionConstants.ALGEBRICKS_DV)
-                        && metadataProvider.findDataverse(namespace) == null) {
-                    throw new CompilationException(ErrorCode.COMPILATION_ERROR, functionCall.getSourceLocation(),
-                            "In function call \"" + namespace + "." + signature.getName() + "(...)\", the dataverse \""
-                                    + namespace + "\" cannot be found!");
-                }
-            } catch (AlgebricksException e) {
-                throw new CompilationException(e);
-            }
             Function function;
             try {
-                function = lookupUserDefinedFunctionDecl(metadataProvider.getMetadataTxnContext(), signature);
+                function = metadataProvider.lookupUserDefinedFunction(fsWithDv);
             } catch (AlgebricksException e) {
-                throw new CompilationException(e);
+                throw new CompilationException(ErrorCode.COMPILATION_ERROR, e, functionCall.getSourceLocation(),
+                        e.toString());
             }
-            if (function == null) {
-                FunctionSignature normalizedSignature = functionNormalizer == null ? signature
-                        : functionNormalizer.normalizeBuiltinFunctionSignature(signature,
-                                functionCall.getSourceLocation());
-                if (BuiltinFunctions.isBuiltinCompilerFunction(normalizedSignature, includePrivateFunctions)) {
-                    continue;
-                }
-                StringBuilder messageBuilder = new StringBuilder();
-                if (!functionDecls.isEmpty()) {
-                    messageBuilder.append("function " + functionDecls.get(functionDecls.size() - 1).getSignature()
-                            + " depends upon function " + signature + " which is undefined");
-                } else {
-                    messageBuilder.append("function " + signature + " is not defined");
-                }
-                throw new CompilationException(ErrorCode.COMPILATION_ERROR, functionCall.getSourceLocation(),
-                        messageBuilder.toString());
+            if (function == null || !functionParser.getLanguage().equals(function.getLanguage())) {
+                // the function is either unknown, builtin, or in a different language.
+                // either way we ignore it here because it will be handled by the function inlining rule later
+                continue;
             }
 
-            if (functionParser.getLanguage().equals(function.getLanguage())) {
-                FunctionDecl functionDecl = functionParser.getFunctionDecl(function);
-                if (functionDecl != null) {
-                    if (functionDecls.contains(functionDecl)) {
-                        throw new CompilationException(ErrorCode.COMPILATION_ERROR, functionCall.getSourceLocation(),
-                                "Recursive invocation " + functionDecls.get(functionDecls.size() - 1).getSignature()
-                                        + " <==> " + functionDecl.getSignature());
-                    }
-                    functionDecls.add(functionDecl);
-                    functionDecls = retrieveUsedStoredFunctions(metadataProvider, functionDecl.getFuncBody(),
-                            declaredFunctions, functionDecls, functionCollector, functionParser, functionNormalizer);
-                }
+            FunctionDecl functionDecl = functionParser.getFunctionDecl(function);
+            if (functionDecls.contains(functionDecl)) {
+                throw new CompilationException(ErrorCode.COMPILATION_ERROR, functionCall.getSourceLocation(),
+                        "Recursive invocation " + functionDecls.get(functionDecls.size() - 1).getSignature() + " <==> "
+                                + functionDecl.getSignature());
             }
+            functionDecls.add(functionDecl);
+            functionDecls = retrieveUsedStoredFunctions(metadataProvider, functionDecl.getFuncBody(), declaredFunctions,
+                    functionDecls, functionCollector, functionParser, function.getDataverseName());
         }
         return functionDecls;
     }
@@ -260,14 +288,6 @@
         return dependencies;
     }
 
-    public static Function lookupUserDefinedFunctionDecl(MetadataTransactionContext mdTxnCtx,
-            FunctionSignature signature) throws AlgebricksException {
-        if (signature.getDataverseName() == null) {
-            return null;
-        }
-        return MetadataManager.INSTANCE.getFunction(mdTxnCtx, signature);
-    }
-
     public static boolean isBuiltinDatasetFunction(FunctionSignature fs) {
         return Objects.equals(FN_DATASET_DATAVERSE_NAME, fs.getDataverseName())
                 && Objects.equals(FN_DATASET_NAME, fs.getName());
@@ -325,4 +345,20 @@
     private static String getStringConstant(Mutable<ILogicalExpression> arg) {
         return ConstantExpressionUtil.getStringConstant(arg.getValue());
     }
+
+    private static boolean getImportPrivateFunctions(MetadataProvider metadataProvider) {
+        String value = (String) metadataProvider.getConfig().get(IMPORT_PRIVATE_FUNCTIONS);
+        return (value != null) && Boolean.parseBoolean(value.toLowerCase());
+    }
+
+    public static Set<FunctionSignature> getFunctionSignatures(List<FunctionDecl> declaredFunctions) {
+        if (declaredFunctions == null || declaredFunctions.isEmpty()) {
+            return Collections.emptySet();
+        }
+        Set<FunctionSignature> result = new HashSet<>();
+        for (FunctionDecl fd : declaredFunctions) {
+            result.add(fd.getSignature());
+        }
+        return result;
+    }
 }
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java
index 984ceb4..eb2fba6 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/AbstractInlineUdfsVisitor.java
@@ -390,14 +390,9 @@
 
     private Expression rewriteFunctionBody(FunctionDecl fnDecl) throws CompilationException {
         SourceLocation sourceLoc = fnDecl.getSourceLocation();
-        Query wrappedQuery = new Query(false);
-        wrappedQuery.setSourceLocation(sourceLoc);
-        wrappedQuery.setBody(fnDecl.getFuncBody());
-        wrappedQuery.setTopLevel(false);
 
         DataverseName fnDataverseName = fnDecl.getSignature().getDataverseName();
         Dataverse defaultDataverse = metadataProvider.getDefaultDataverse();
-
         Dataverse fnDataverse;
         if (fnDataverseName == null || fnDataverseName.equals(defaultDataverse.getDataverseName())) {
             fnDataverse = defaultDataverse;
@@ -411,10 +406,17 @@
 
         metadataProvider.setDefaultDataverse(fnDataverse);
         try {
+            Query wrappedQuery = new Query(false);
+            wrappedQuery.setSourceLocation(sourceLoc);
+            wrappedQuery.setBody(fnDecl.getFuncBody());
+            wrappedQuery.setTopLevel(false);
             IQueryRewriter queryRewriter = rewriterFactory.createQueryRewriter();
             queryRewriter.rewrite(declaredFunctions, wrappedQuery, metadataProvider, context, true,
                     fnDecl.getParamList());
             return wrappedQuery.getBody();
+        } catch (CompilationException e) {
+            throw new CompilationException(ErrorCode.COMPILATION_BAD_FUNCTION_DEFINITION, e, fnDecl.getSignature(),
+                    e.getMessage());
         } finally {
             metadataProvider.setDefaultDataverse(defaultDataverse);
         }
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
index e7104dd..a89ca5b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java
@@ -42,6 +42,9 @@
         // Sets up parameters.
         setup(declaredFunctions, topStatement, metadataProvider, context, externalVars);
 
+        // Resolves function calls
+        resolveFunctionCalls();
+
         // Generates column names.
         generateColumnNames();
 
@@ -64,11 +67,14 @@
         // Must run after rewriteSetOperations() and before variableCheckAndRewrite()
         rewriteGroupingSets();
 
+        // Window expression core rewrites.
+        rewriteWindowExpressions();
+
         // Generate ids for variables (considering scopes) and replace global variable access with the dataset function.
         variableCheckAndRewrite();
 
         //  Extracts SQL-92 aggregate functions from CASE/IF expressions into LET clauses
-        rewriteCaseExpressions();
+        extractAggregatesFromCaseExpressions();
 
         // Rewrites SQL-92 global aggregations.
         rewriteGroupByAggregationSugar();
@@ -79,6 +85,9 @@
         // Rewrites like/not-like expressions.
         rewriteOperatorExpression();
 
+        // Normalizes CASE expressions and rewrites simple ones into switch-case()
+        rewriteCaseExpressions();
+
         // Rewrites several variable-arg functions into their corresponding internal list-input functions.
         rewriteListInputFunctions();
 
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
index 1674940..7339a08 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
@@ -63,19 +63,20 @@
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.InlineWithExpressionVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.OperatorExpressionVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SetOperationVisitor;
-import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppBuiltinFunctionRewriteVisitor;
-import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppCaseRewriteVisitor;
+import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppCaseAggregateExtractionVisitor;
+import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppCaseExpressionVisitor;
+import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppFunctionCallResolverVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppGroupByAggregationSugarVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppGroupByVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppGroupingSetsVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppInlineUdfsVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppListInputFunctionRewriteVisitor;
+import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppSpecialFunctionNameRewriteVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppWindowAggregationSugarVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SqlppWindowRewriteVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.SubstituteGroupbyExpressionWithVariableVisitor;
 import org.apache.asterix.lang.sqlpp.rewrites.visitor.VariableCheckAndRewriteVisitor;
 import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
-import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
 import org.apache.asterix.lang.sqlpp.util.SqlppAstPrintUtil;
 import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil;
 import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
@@ -128,6 +129,9 @@
         // Sets up parameters.
         setup(declaredFunctions, topStatement, metadataProvider, context, externalVars);
 
+        // Resolves function calls
+        resolveFunctionCalls();
+
         // Generates column names.
         generateColumnNames();
 
@@ -154,7 +158,7 @@
         variableCheckAndRewrite();
 
         //  Extracts SQL-92 aggregate functions from CASE/IF expressions into LET clauses
-        rewriteCaseExpressions();
+        extractAggregatesFromCaseExpressions();
 
         // Rewrites SQL-92 aggregate functions
         rewriteGroupByAggregationSugar();
@@ -165,21 +169,22 @@
         // Rewrites like/not-like expressions.
         rewriteOperatorExpression();
 
+        // Normalizes CASE expressions and rewrites simple ones into switch-case()
+        rewriteCaseExpressions();
+
         // Rewrites several variable-arg functions into their corresponding internal list-input functions.
         rewriteListInputFunctions();
 
         // Inlines functions.
         inlineDeclaredUdfs(inlineUdfs);
 
-        // Rewrites function names.
-        // This should be done after inlineDeclaredUdfs() because user-defined function
-        // names could be case sensitive.
-        rewriteFunctionNames();
-
         // Inlines WITH expressions after variableCheckAndRewrite(...) so that the variable scoping for WITH
         // expression is correct.
         inlineWithExpressions();
 
+        // Rewrites SQL++ core aggregate function names into internal names
+        rewriteSpecialFunctionNames();
+
         // Sets the var counter of the query.
         topStatement.setVarCounter(context.getVarCounter().get());
     }
@@ -194,9 +199,15 @@
         rewriteTopExpr(listInputFunctionVisitor, null);
     }
 
-    protected void rewriteFunctionNames() throws CompilationException {
-        SqlppBuiltinFunctionRewriteVisitor functionNameMapVisitor = new SqlppBuiltinFunctionRewriteVisitor();
-        rewriteTopExpr(functionNameMapVisitor, null);
+    protected void resolveFunctionCalls() throws CompilationException {
+        SqlppFunctionCallResolverVisitor visitor =
+                new SqlppFunctionCallResolverVisitor(metadataProvider, declaredFunctions);
+        rewriteTopExpr(visitor, null);
+    }
+
+    protected void rewriteSpecialFunctionNames() throws CompilationException {
+        SqlppSpecialFunctionNameRewriteVisitor visitor = new SqlppSpecialFunctionNameRewriteVisitor();
+        rewriteTopExpr(visitor, null);
     }
 
     protected void inlineWithExpressions() throws CompilationException {
@@ -267,8 +278,14 @@
         rewriteTopExpr(windowVisitor, null);
     }
 
+    protected void extractAggregatesFromCaseExpressions() throws CompilationException {
+        SqlppCaseAggregateExtractionVisitor visitor = new SqlppCaseAggregateExtractionVisitor(context);
+        rewriteTopExpr(visitor, null);
+    }
+
     protected void rewriteCaseExpressions() throws CompilationException {
-        SqlppCaseRewriteVisitor visitor = new SqlppCaseRewriteVisitor(context);
+        // Normalizes CASE expressions and rewrites simple ones into switch-case()
+        SqlppCaseExpressionVisitor visitor = new SqlppCaseExpressionVisitor();
         rewriteTopExpr(visitor, null);
     }
 
@@ -280,16 +297,14 @@
 
         List<FunctionDecl> usedStoredFunctionDecls = new ArrayList<>();
         for (Expression topLevelExpr : topExpr.getDirectlyEnclosedExpressions()) {
-            usedStoredFunctionDecls
-                    .addAll(FunctionUtil.retrieveUsedStoredFunctions(metadataProvider, topLevelExpr, funIds, null,
-                            expr -> getFunctionCalls(expr), functionParser, (signature, sourceLoc) -> FunctionMapUtil
-                                    .normalizeBuiltinFunctionSignature(signature, false, sourceLoc)));
+            usedStoredFunctionDecls.addAll(FunctionUtil.retrieveUsedStoredFunctions(metadataProvider, topLevelExpr,
+                    funIds, null, this::getFunctionCalls, functionParser, metadataProvider.getDefaultDataverseName()));
         }
         declaredFunctions.addAll(usedStoredFunctionDecls);
         if (inlineUdfs && !declaredFunctions.isEmpty()) {
-            SqlppInlineUdfsVisitor visitor = new SqlppInlineUdfsVisitor(context,
-                    new SqlppFunctionBodyRewriterFactory(
-                            parserFactory) /* the rewriter for function bodies expressions*/,
+            SqlppFunctionBodyRewriterFactory functionBodyRewriterFactory =
+                    new SqlppFunctionBodyRewriterFactory(parserFactory);
+            SqlppInlineUdfsVisitor visitor = new SqlppInlineUdfsVisitor(context, functionBodyRewriterFactory,
                     declaredFunctions, metadataProvider);
             while (rewriteTopExpr(visitor, declaredFunctions)) {
                 // loop until no more changes
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseAggregateExtractionVisitor.java
similarity index 95%
rename from asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseRewriteVisitor.java
rename to asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseAggregateExtractionVisitor.java
index cfe41ed..4204880 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseAggregateExtractionVisitor.java
@@ -44,9 +44,9 @@
  * Extracts SQL-92 aggregate functions from CASE/IF expressions into LET clauses,
  * so they can be pushed into GROUPBY subplans by the optimizer.
  */
-public final class SqlppCaseRewriteVisitor extends AbstractSqlppExpressionExtractionVisitor {
+public final class SqlppCaseAggregateExtractionVisitor extends AbstractSqlppExpressionExtractionVisitor {
 
-    public SqlppCaseRewriteVisitor(LangRewritingContext context) {
+    public SqlppCaseAggregateExtractionVisitor(LangRewritingContext context) {
         super(context);
     }
 
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseExpressionVisitor.java
similarity index 81%
rename from asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
rename to asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseExpressionVisitor.java
index 82284f3..59996df 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppCaseExpressionVisitor.java
@@ -31,28 +31,23 @@
 import org.apache.asterix.lang.common.literal.TrueLiteral;
 import org.apache.asterix.lang.common.struct.OperatorType;
 import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.WindowExpression;
-import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
 import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil;
 import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
 import org.apache.asterix.om.functions.BuiltinFunctions;
 
-public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
-
-    @Override
-    public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
-        //TODO(buyingyi): rewrite SQL temporal functions
-        callExpr.setFunctionSignature(FunctionMapUtil.normalizeBuiltinFunctionSignature(callExpr.getFunctionSignature(),
-                true, callExpr.getSourceLocation()));
-        return super.visit(callExpr, arg);
-    }
-
-    @Override
-    public Expression visit(WindowExpression winExpr, ILangExpression arg) throws CompilationException {
-        winExpr.setFunctionSignature(FunctionMapUtil.normalizeBuiltinFunctionSignature(winExpr.getFunctionSignature(),
-                true, winExpr.getSourceLocation()));
-        return super.visit(winExpr, arg);
-    }
+/**
+ * CASE expression rewritings:
+ * <ul>
+ * <li>
+ * Normalize WHEN expressions so that it can have correct NULL/MISSING semantics as well
+ * as type promotion semantics.
+ * </li>
+ * <li>
+ * If the CASE expression does not contain a subquery then rewrite it to a switch-case function call.
+ * </li>
+ * </ul>
+ */
+public final class SqlppCaseExpressionVisitor extends AbstractSqlppSimpleExpressionVisitor {
 
     @Override
     public Expression visit(CaseExpression caseExpr, ILangExpression arg) throws CompilationException {
@@ -84,10 +79,9 @@
     // Normalizes WHEN expressions so that it can have correct NULL/MISSING semantics as well
     // as type promotion semantics.
     private CaseExpression normalizeCaseExpr(CaseExpression caseExpr) throws CompilationException {
-        LiteralExpr trueLiteral = new LiteralExpr(TrueLiteral.INSTANCE);
-        trueLiteral.setSourceLocation(caseExpr.getSourceLocation());
         Expression conditionExpr = caseExpr.getConditionExpr();
-        if (trueLiteral.equals(conditionExpr)) {
+        if (conditionExpr.getKind() == Expression.Kind.LITERAL_EXPRESSION
+                && ((LiteralExpr) conditionExpr).getValue().equals(TrueLiteral.INSTANCE)) {
             return caseExpr;
         }
         List<Expression> normalizedWhenExprs = new ArrayList<>();
@@ -99,10 +93,11 @@
             operatorExpr.setSourceLocation(expr.getSourceLocation());
             normalizedWhenExprs.add(operatorExpr);
         }
+        LiteralExpr trueLiteral = new LiteralExpr(TrueLiteral.INSTANCE);
+        trueLiteral.setSourceLocation(caseExpr.getSourceLocation());
         CaseExpression newCaseExpr =
                 new CaseExpression(trueLiteral, normalizedWhenExprs, caseExpr.getThenExprs(), caseExpr.getElseExpr());
         newCaseExpr.setSourceLocation(caseExpr.getSourceLocation());
         return newCaseExpr;
     }
-
 }
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
new file mode 100644
index 0000000..ce2ff2b
--- /dev/null
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppFunctionCallResolverVisitor.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.lang.sqlpp.rewrites.visitor;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.functions.FunctionConstants;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.ILangExpression;
+import org.apache.asterix.lang.common.expression.CallExpr;
+import org.apache.asterix.lang.common.statement.FunctionDecl;
+import org.apache.asterix.lang.common.util.FunctionUtil;
+import org.apache.asterix.lang.sqlpp.expression.WindowExpression;
+import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
+import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
+import org.apache.asterix.metadata.declared.MetadataProvider;
+import org.apache.asterix.om.functions.BuiltinFunctions;
+
+public final class SqlppFunctionCallResolverVisitor extends AbstractSqlppSimpleExpressionVisitor {
+
+    private final MetadataProvider metadataProvider;
+
+    private final Set<FunctionSignature> declaredFunctions;
+
+    private final BiFunction<String, Integer, FunctionSignature> builtinFunctionResolver;
+
+    private final BiFunction<String, Integer, FunctionSignature> callExprResolver;
+
+    public SqlppFunctionCallResolverVisitor(MetadataProvider metadataProvider, List<FunctionDecl> declaredFunctions) {
+        this.metadataProvider = metadataProvider;
+        this.declaredFunctions = FunctionUtil.getFunctionSignatures(declaredFunctions);
+        this.builtinFunctionResolver = FunctionUtil.createBuiltinFunctionResolver(metadataProvider);
+        this.callExprResolver = this::resolveCallExpr;
+    }
+
+    @Override
+    public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
+        FunctionSignature fs = FunctionUtil.resolveFunctionCall(callExpr.getFunctionSignature(),
+                callExpr.getSourceLocation(), metadataProvider, declaredFunctions, callExprResolver);
+        callExpr.setFunctionSignature(fs);
+        return super.visit(callExpr, arg);
+    }
+
+    @Override
+    public Expression visit(WindowExpression winExpr, ILangExpression arg) throws CompilationException {
+        FunctionSignature fs = FunctionUtil.resolveFunctionCall(winExpr.getFunctionSignature(),
+                winExpr.getSourceLocation(), metadataProvider, declaredFunctions, callExprResolver);
+        winExpr.setFunctionSignature(fs);
+        return super.visit(winExpr, arg);
+    }
+
+    private FunctionSignature resolveCallExpr(String name, int arity) {
+        FunctionSignature fs = builtinFunctionResolver.apply(name, arity);
+        if (fs != null) {
+            return fs;
+        }
+        fs = new FunctionSignature(FunctionConstants.ASTERIX_DV, name, arity);
+        return isAggregateFunction(fs) || isWindowFunction(fs) ? fs : null;
+    }
+
+    private static boolean isAggregateFunction(FunctionSignature fs) {
+        return FunctionMapUtil.isSql92AggregateFunction(fs) || FunctionMapUtil.isCoreAggregateFunction(fs);
+    }
+
+    private static boolean isWindowFunction(FunctionSignature fs) {
+        return BuiltinFunctions.getWindowFunction(fs.createFunctionIdentifier()) != null;
+    }
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppSpecialFunctionNameRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppSpecialFunctionNameRewriteVisitor.java
new file mode 100644
index 0000000..7d892d6
--- /dev/null
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppSpecialFunctionNameRewriteVisitor.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.lang.sqlpp.rewrites.visitor;
+
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.exceptions.ErrorCode;
+import org.apache.asterix.common.functions.FunctionConstants;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.ILangExpression;
+import org.apache.asterix.lang.common.expression.CallExpr;
+import org.apache.asterix.lang.sqlpp.expression.WindowExpression;
+import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
+import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.api.exceptions.SourceLocation;
+
+public final class SqlppSpecialFunctionNameRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
+
+    @Override
+    public Expression visit(CallExpr callExpr, ILangExpression arg) throws CompilationException {
+        callExpr.setFunctionSignature(
+                rewriteCoreAggregateFunction(callExpr.getFunctionSignature(), callExpr.getSourceLocation()));
+        return super.visit(callExpr, arg);
+    }
+
+    @Override
+    public Expression visit(WindowExpression winExpr, ILangExpression arg) throws CompilationException {
+        winExpr.setFunctionSignature(
+                rewriteCoreAggregateFunction(winExpr.getFunctionSignature(), winExpr.getSourceLocation()));
+        return super.visit(winExpr, arg);
+    }
+
+    private static FunctionSignature rewriteCoreAggregateFunction(FunctionSignature fs, SourceLocation sourceLoc)
+            throws CompilationException {
+        FunctionIdentifier coreAggregate = FunctionMapUtil.findInternalCoreAggregateFunction(fs);
+        if (coreAggregate != null) {
+            return new FunctionSignature(FunctionConstants.ASTERIX_DV, coreAggregate.getName(), fs.getArity());
+        }
+        if (FunctionMapUtil.isSql92AggregateFunction(fs)) {
+            throw new CompilationException(ErrorCode.COMPILATION_ERROR, sourceLoc,
+                    fs.getName() + " is a SQL-92 aggregate function. The SQL++ core aggregate function "
+                            + FunctionMapUtil.sql92ToCoreAggregateFunction(fs).getName()
+                            + " could potentially express the intent.");
+        }
+        if (FunctionMapUtil.getInternalWindowFunction(fs) != null) {
+            throw new CompilationException(ErrorCode.COMPILATION_UNEXPECTED_WINDOW_EXPRESSION, sourceLoc);
+        }
+        return fs;
+    }
+}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
index 95ca9b1..a46f10b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
@@ -25,8 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.common.exceptions.ErrorCode;
 import org.apache.asterix.common.functions.FunctionConstants;
 import org.apache.asterix.common.functions.FunctionSignature;
 import org.apache.asterix.lang.common.expression.CallExpr;
@@ -36,7 +34,6 @@
 import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
 import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
-import org.apache.hyracks.api.exceptions.SourceLocation;
 
 public class FunctionMapUtil {
 
@@ -112,49 +109,28 @@
      *         false otherwise.
      */
     public static boolean isCoreAggregateFunction(FunctionSignature fs) {
-        String internalName = getInternalCoreAggregateFunctionName(fs);
-        if (internalName != null) {
-            FunctionIdentifier fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, internalName, fs.getArity());
-            IFunctionInfo finfo = FunctionUtil.getFunctionInfo(fi);
-            return finfo != null && BuiltinFunctions.getAggregateFunction(finfo.getFunctionIdentifier()) != null;
-        }
-        return false;
+        return findInternalCoreAggregateFunction(fs) != null;
     }
 
     /**
-     * Maps a user invoked function signature to a system internal function signature.
+     * Returns a function identifier of an internal core aggregate function
+     * that this SQL++ core aggregate function maps to.
+     * Returns {@code null} if given function is not a SQL++ core aggregate function
      *
-     * @param fs
-     *            the user typed function.
-     * @param checkSql92Aggregate
-     *            enable check if the function is a SQL-92 aggregate function
-     * @param sourceLoc
-     *            the source location of the function call
-     * @return the system internal function.
-     * @throws CompilationException
-     *             if checkSql92Aggregate is true and the function is a SQL-92 aggregate function
+     * @param fs the function signature.
      */
-    public static FunctionSignature normalizeBuiltinFunctionSignature(FunctionSignature fs, boolean checkSql92Aggregate,
-            SourceLocation sourceLoc) throws CompilationException {
-        FunctionSignature ns = CommonFunctionMapUtil.normalizeBuiltinFunctionSignature(fs);
-        String internalName = getInternalCoreAggregateFunctionName(ns);
-        if (internalName != null) {
-            FunctionIdentifier fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, internalName, ns.getArity());
-            IFunctionInfo finfo = FunctionUtil.getFunctionInfo(fi);
-            if (finfo != null && BuiltinFunctions.getAggregateFunction(finfo.getFunctionIdentifier()) != null) {
-                return new FunctionSignature(FunctionConstants.ASTERIX_DV, internalName, ns.getArity());
-            }
-        } else if (checkSql92Aggregate) {
-            if (isSql92AggregateFunction(ns)) {
-                throw new CompilationException(ErrorCode.COMPILATION_ERROR, sourceLoc,
-                        fs.getName() + " is a SQL-92 aggregate function. The SQL++ core aggregate function "
-                                + sql92ToCoreAggregateFunction(ns).getName()
-                                + " could potentially express the intent.");
-            } else if (getInternalWindowFunction(ns) != null) {
-                throw new CompilationException(ErrorCode.COMPILATION_UNEXPECTED_WINDOW_EXPRESSION, sourceLoc);
-            }
+    public static FunctionIdentifier findInternalCoreAggregateFunction(FunctionSignature fs) {
+        String internalName = getInternalCoreAggregateFunctionName(fs);
+        if (internalName == null) {
+            return null;
         }
-        return new FunctionSignature(ns.getDataverseName(), ns.getName(), ns.getArity());
+        FunctionIdentifier fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, internalName, fs.getArity());
+        IFunctionInfo finfo = FunctionUtil.getFunctionInfo(fi);
+        if (finfo == null) {
+            return null;
+        }
+        FunctionIdentifier fid = finfo.getFunctionIdentifier();
+        return BuiltinFunctions.getAggregateFunction(fid) != null ? fid : null;
     }
 
     /**
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckNonFunctionalExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckNonFunctionalExpressionVisitor.java
index 7a8f47f..bae21e4 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckNonFunctionalExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckNonFunctionalExpressionVisitor.java
@@ -51,8 +51,7 @@
             }
         } else {
             try {
-                Function function =
-                        FunctionUtil.lookupUserDefinedFunctionDecl(metadataProvider.getMetadataTxnContext(), fs);
+                Function function = metadataProvider.lookupUserDefinedFunction(fs);
                 if (function != null && function.getDeterministic() != null && !function.getDeterministic()) {
                     return true;
                 }
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
index 7c9a4a7..9c5c1a4 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
@@ -57,9 +57,7 @@
 import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
 import org.apache.asterix.lang.sqlpp.expression.WindowExpression;
 import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
-import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
 import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
-import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class SqlppAstPrintVisitor extends QueryPrintVisitor implements ISqlppVisitor<Void, Integer> {
@@ -252,11 +250,6 @@
     @Override
     public Void visit(CallExpr callExpr, Integer step) throws CompilationException {
         FunctionSignature functionSignature = callExpr.getFunctionSignature();
-        FunctionSignature normalizedFunctionSignature = FunctionMapUtil
-                .normalizeBuiltinFunctionSignature(functionSignature, false, callExpr.getSourceLocation());
-        if (BuiltinFunctions.isBuiltinCompilerFunction(normalizedFunctionSignature, true)) {
-            functionSignature = normalizedFunctionSignature;
-        }
         //TODO(MULTI_PART_DATAVERSE_NAME):temporary workaround to preserve AST reference results
         if (FunctionUtil.isBuiltinDatasetFunction(functionSignature)) {
             String singleArg = callExpr.getExprList().stream().map(LiteralExpr.class::cast).map(LiteralExpr::getValue)
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index 8597a21..2933756 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
 
 import org.apache.asterix.common.cluster.IClusterStateManager;
 import org.apache.asterix.common.config.DatasetConfig.DatasetType;
@@ -41,6 +40,7 @@
 import org.apache.asterix.common.dataflow.LSMTreeInsertDeleteOperatorDescriptor;
 import org.apache.asterix.common.exceptions.AsterixException;
 import org.apache.asterix.common.external.IDataSourceAdapter;
+import org.apache.asterix.common.functions.FunctionSignature;
 import org.apache.asterix.common.metadata.DataverseName;
 import org.apache.asterix.common.metadata.LockList;
 import org.apache.asterix.common.storage.ICompressionManager;
@@ -81,6 +81,7 @@
 import org.apache.asterix.metadata.entities.Feed;
 import org.apache.asterix.metadata.entities.FeedConnection;
 import org.apache.asterix.metadata.entities.FeedPolicyEntity;
+import org.apache.asterix.metadata.entities.Function;
 import org.apache.asterix.metadata.entities.Index;
 import org.apache.asterix.metadata.entities.Synonym;
 import org.apache.asterix.metadata.feeds.FeedMetadataUtil;
@@ -180,7 +181,7 @@
     private boolean blockingOperatorDisabled = false;
 
     public static MetadataProvider create(ICcApplicationContext appCtx, Dataverse defaultDataverse) {
-        Function<ICcApplicationContext, IMetadataProvider<?, ?>> factory =
+        java.util.function.Function<ICcApplicationContext, IMetadataProvider<?, ?>> factory =
                 ((ICCExtensionManager) appCtx.getExtensionManager()).getMetadataProviderFactory();
         MetadataProvider mp = factory != null ? (MetadataProvider) factory.apply(appCtx) : new MetadataProvider(appCtx);
         mp.setDefaultDataverse(defaultDataverse);
@@ -446,6 +447,13 @@
         return BuiltinFunctions.lookupFunction(fid);
     }
 
+    public Function lookupUserDefinedFunction(FunctionSignature signature) throws AlgebricksException {
+        if (signature.getDataverseName() == null) {
+            return null;
+        }
+        return MetadataManager.INSTANCE.getFunction(mdTxnCtx, signature);
+    }
+
     @Override
     public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getScannerRuntime(
             IDataSource<DataSourceId> dataSource, List<LogicalVariable> scanVariables,
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
index 19c1b51..96ad4a9 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
@@ -3094,22 +3094,21 @@
     }
 
     public static boolean isBuiltinCompilerFunction(FunctionSignature signature, boolean includePrivateFunctions) {
-        FunctionIdentifier fi =
-                new FunctionIdentifier(FunctionConstants.ASTERIX_NS, signature.getName(), signature.getArity());
-        IFunctionInfo finfo = getAsterixFunctionInfo(fi);
-        if (builtinPublicFunctionsSet.keySet().contains(finfo)
-                || (includePrivateFunctions && builtinPrivateFunctionsSet.keySet().contains(finfo))) {
-            return true;
-        }
-        fi = new FunctionIdentifier(AlgebricksBuiltinFunctions.ALGEBRICKS_NS, signature.getName(),
-                signature.getArity());
-        finfo = getAsterixFunctionInfo(fi);
-        if (builtinPublicFunctionsSet.keySet().contains(finfo)
-                || (includePrivateFunctions && builtinPrivateFunctionsSet.keySet().contains(finfo))) {
-            return true;
-        }
+        return getBuiltinCompilerFunction(signature.getName(), signature.getArity(), includePrivateFunctions) != null;
+    }
 
-        return false;
+    public static FunctionIdentifier getBuiltinCompilerFunction(String name, int arity,
+            boolean includePrivateFunctions) {
+        FunctionIdentifier fi = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, name, arity);
+        IFunctionInfo finfo = getAsterixFunctionInfo(fi);
+        if (builtinPublicFunctionsSet.containsKey(finfo)
+                || (includePrivateFunctions && builtinPrivateFunctionsSet.containsKey(finfo))) {
+            return fi;
+        }
+        fi = new FunctionIdentifier(AlgebricksBuiltinFunctions.ALGEBRICKS_NS, name, arity);
+        finfo = getAsterixFunctionInfo(fi);
+        return builtinPublicFunctionsSet.containsKey(finfo)
+                || (includePrivateFunctions && builtinPrivateFunctionsSet.containsKey(finfo)) ? fi : null;
     }
 
     public static boolean isBuiltinAggregateFunction(FunctionIdentifier fi) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
index 484f374..a7377f8 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
@@ -19,6 +19,7 @@
 package org.apache.asterix.om.functions;
 
 import java.util.List;
+import java.util.Objects;
 
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
@@ -62,7 +63,8 @@
 
     @Override
     public int hashCode() {
-        return toString().hashCode();
+        return Objects.hash(functionIdentifier.getNamespace(), functionIdentifier.getName(),
+                functionIdentifier.getArity());
     }
 
     @Override