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 463c2ab..a727fb4 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
@@ -21,7 +21,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall twitter.count@1[
+    FunctionCall twitter.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
index 28bcc99..41092db 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
@@ -50,7 +50,7 @@
   (
     LiteralExpr [STRING] [cnt-orders]
     :
-    FunctionCall custorder.count@1[
+    FunctionCall custorder.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
index 679e9d5..8a5cb38 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
@@ -37,7 +37,7 @@
   (
     LiteralExpr [STRING] [count_suppkey]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
index 05c7abf..b5e5161 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
@@ -80,7 +80,7 @@
 
         Let Variable [ Name=$count ]
           :=
-          FunctionCall rares03.count@1[
+          FunctionCall rares03.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 a0c6feb..ee802a0 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
@@ -80,7 +80,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin_078.count@1[
+          FunctionCall fuzzyjoin_078.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
index 6a4815e..37eefd4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
@@ -92,7 +92,7 @@
 
 Let Variable [ Name=$sig_sponsorship_count ]
   :=
-  FunctionCall events.count@1[
+  FunctionCall events.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
@@ -118,7 +118,7 @@
       (
         LiteralExpr [STRING] [escount]
         :
-        FunctionCall events.count@1[
+        FunctionCall events.sql-count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
index 7a0ad61..fdcafeb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
@@ -31,7 +31,7 @@
   (
     LiteralExpr [STRING] [count_order]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 61f1678..7f7b2f3 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
@@ -162,7 +162,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -255,7 +255,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
index 3bd944f..13c4380 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
@@ -59,7 +59,7 @@
 
 Let Variable [ Name=$sig_sponsorship_count ]
   :=
-  FunctionCall null.count@1[
+  FunctionCall null.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
@@ -85,7 +85,7 @@
       (
         LiteralExpr [STRING] [escount]
         :
-        FunctionCall null.count@1[
+        FunctionCall null.sql-count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
index 584c736..1f46935 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/groupby_clause_count.ast
@@ -1,6 +1,6 @@
 Query:
 SELECT ELEMENT [
-FunctionCall null.count@1[
+FunctionCall null.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
index b43aca8..d1be6d2 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
@@ -59,7 +59,7 @@
 
 Let Variable [ Name=$sig_sponsorship_count ]
   :=
-  FunctionCall null.count@1[
+  FunctionCall null.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
@@ -85,7 +85,7 @@
       (
         LiteralExpr [STRING] [escount]
         :
-        FunctionCall null.count@1[
+        FunctionCall null.sql-count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/null/null.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/null/null.1.query.sqlpp
new file mode 100644
index 0000000..f78024e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/null/null.1.query.sqlpp
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+SELECT avg(e) as average, count(e) as count, sum(e) as sum, min(e) as min, max(e) as max
+FROM [1, 2, 3, null, 4] AS e;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.query.sqlpp
new file mode 100644
index 0000000..5a25013
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.query.sqlpp
@@ -0,0 +1,29 @@
+/*
+ * 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 TinySocial;
+
+
+SELECT avg("get-year"(employment."end-date")) AS average,
+       count(employment."end-date") AS count,
+       sum("get-year"(employment."end-date")) AS sum,
+       min(employment."end-date") AS min,
+       max(employment."end-date") AS max
+FROM  FacebookUsers as fbu, fbu.employment AS employment
+;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.query.sqlpp
new file mode 100644
index 0000000..cdebdcc
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.query.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * 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 TinySocial;
+
+
+SELECT org AS organization,
+       avg("get-year"(employment."end-date")) AS average,
+       count(employment."end-date") AS count,
+       sum("get-year"(employment."end-date")) AS sum,
+       min(employment."end-date") AS min,
+       max(employment."end-date") AS max
+FROM  FacebookUsers as fbu, fbu.employment AS employment
+GROUP BY employment."organization-name" AS org
+;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/agg_number/agg_number.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/agg_number/agg_number.1.adm
index 91e6906..0e85837 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/agg_number/agg_number.1.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/agg_number/agg_number.1.adm
@@ -1 +1 @@
-{ "sql-count1": 4, "sql-count2": 4, "average1": 2.3461845695961844E16d, "sql-sum1": 9.3847382783847376E16d, "sql-min1": 1.0d, "sql-max1": 9.3847382783847376E16d, "average2": 2.3461845695961844E16d, "sql-sum2": 9.3847382783847376E16d, "sql-min2": 1.0d, "sql-max2": 9.3847382783847376E16d }
+{ "sql-count1": 4, "average1": 2.3461845695961844E16d, "sql-count2": 4, "average2": 2.3461845695961844E16d, "sql-sum1": 9.3847382783847376E16d, "sql-min1": 1.0d, "sql-max1": 9.3847382783847376E16d, "sql-sum2": 9.3847382783847376E16d, "sql-min2": 1.0d, "sql-max2": 9.3847382783847376E16d }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/null/null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/null/null.1.adm
new file mode 100644
index 0000000..3c5ff5a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/group-by/null/null.1.adm
@@ -0,0 +1 @@
+{ "average": 2.5d, "count": 4, "sum": 10, "min": 1, "max": 4 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/aggregate.27.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/aggregate.27.adm
new file mode 100644
index 0000000..fe79be3
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/aggregate.27.adm
@@ -0,0 +1 @@
+{ "average": 2010.0d, "count": 3, "sum": 6030, "min": date("2009-12-13"), "max": date("2011-11-05") }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/group-by.26.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/group-by.26.adm
new file mode 100644
index 0000000..abeda77
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tinysocial/tinysocial-suite-open/group-by.26.adm
@@ -0,0 +1,10 @@
+{ "average": 2009.0d, "count": 1, "sum": 2009, "organization": "Zuncan", "min": date("2009-12-13"), "max": date("2009-12-13") }
+{ "average": null, "count": 0, "sum": null, "organization": "Labzatron", "min": null, "max": null }
+{ "average": null, "count": 0, "sum": null, "organization": "Plexlane", "min": null, "max": null }
+{ "average": null, "count": 0, "sum": null, "organization": "jaydax", "min": null, "max": null }
+{ "average": null, "count": 0, "sum": null, "organization": "Codetechno", "min": null, "max": null }
+{ "average": null, "count": 0, "sum": null, "organization": "Hexviafind", "min": null, "max": null }
+{ "average": null, "count": 0, "sum": null, "organization": "Zamcorporation", "min": null, "max": null }
+{ "average": 2011.0d, "count": 1, "sum": 2011, "organization": "physcane", "min": date("2011-11-05"), "max": date("2011-11-05") }
+{ "average": null, "count": 0, "sum": null, "organization": "Kongreen", "min": null, "max": null }
+{ "average": 2010.0d, "count": 1, "sum": 2010, "organization": "geomedia", "min": date("2010-01-26"), "max": date("2010-01-26") }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
index f08b448..f8a709b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
@@ -60,7 +60,7 @@
 
 Let Variable [ Name=$sig_sponsorship_count ]
   :=
-  FunctionCall test.count@1[
+  FunctionCall test.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
@@ -86,7 +86,7 @@
       (
         LiteralExpr [STRING] [escount]
         :
-        FunctionCall test.count@1[
+        FunctionCall test.sql-count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
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 9097792..884a1aa 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
@@ -28,7 +28,7 @@
   )
 
 Orderby
-  FunctionCall fuzzyjoin.count@1[
+  FunctionCall fuzzyjoin.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 892dfd4..0279463 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
@@ -35,7 +35,7 @@
   )
 
 Orderby
-  FunctionCall fuzzyjoin.count@1[
+  FunctionCall fuzzyjoin.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 892dfd4..0279463 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
@@ -35,7 +35,7 @@
   )
 
 Orderby
-  FunctionCall fuzzyjoin.count@1[
+  FunctionCall fuzzyjoin.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 fa2eda4..37f1f7c 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
@@ -35,7 +35,7 @@
   )
 
 Orderby
-  FunctionCall fuzzyjoin.count@1[
+  FunctionCall fuzzyjoin.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 51bc1bc..378d301 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
@@ -108,7 +108,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 44c07b7..d77ee91 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
@@ -67,7 +67,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 b6090dd..de0c379 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
@@ -74,7 +74,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 c6dba16..0359a32 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
@@ -78,7 +78,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 3b1ded7..b43a06c 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
@@ -82,7 +82,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 42edfe5..c8a4003 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
@@ -93,7 +93,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 42edfe5..c8a4003 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
@@ -93,7 +93,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 42edfe5..c8a4003 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
@@ -93,7 +93,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 42edfe5..c8a4003 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
@@ -93,7 +93,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 2fc6e0f..3ae14cf 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
@@ -93,7 +93,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 9257b1e..350a380 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
@@ -142,7 +142,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -235,7 +235,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 9257b1e..350a380 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
@@ -142,7 +142,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -235,7 +235,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 c9d8570..75f9c99 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
@@ -152,7 +152,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -245,7 +245,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 2c59ebb..d24bda4 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
@@ -112,7 +112,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -193,7 +193,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 7818c84..150b749 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
@@ -119,7 +119,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -207,7 +207,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 df4f32a..31b79d2 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
@@ -126,7 +126,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -222,7 +222,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 ce7906f..f6dcead 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
@@ -130,7 +130,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -231,7 +231,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 e7f281d..936ac81 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
@@ -136,7 +136,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -244,7 +244,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 e7f281d..936ac81 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
@@ -136,7 +136,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -244,7 +244,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 3ffdad1..b445f35 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
@@ -136,7 +136,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -244,7 +244,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 e7f281d..936ac81 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
@@ -136,7 +136,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -244,7 +244,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 3ffdad1..b445f35 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
@@ -136,7 +136,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -244,7 +244,7 @@
           )
 
         Orderby
-          FunctionCall fuzzyjoin.count@1[
+          FunctionCall fuzzyjoin.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
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 92e8c06..6ecd6a4 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
@@ -135,7 +135,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -216,7 +216,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 efbad42..b82fc31 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
@@ -142,7 +142,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -230,7 +230,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 2deaaf5..8fcf073 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
@@ -149,7 +149,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -245,7 +245,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 3dcfb48..b3923a8 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
@@ -153,7 +153,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -254,7 +254,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 3588a30..bf3eb4e 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
@@ -159,7 +159,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -267,7 +267,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 3588a30..bf3eb4e 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
@@ -159,7 +159,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -267,7 +267,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 3588a30..bf3eb4e 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
@@ -159,7 +159,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -267,7 +267,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 adcea8c..44ac6dd 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
@@ -159,7 +159,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -267,7 +267,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 18723de..6bc2b0b 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
@@ -206,7 +206,7 @@
                   )
 
                 Orderby
-                  FunctionCall fuzzyjoin.count@1[
+                  FunctionCall fuzzyjoin.sql-count@1[
                     (
                       SELECT ELEMENT [
                       FieldAccessor [
@@ -314,7 +314,7 @@
                   )
 
                 Orderby
-                  FunctionCall fuzzyjoin.count@1[
+                  FunctionCall fuzzyjoin.sql-count@1[
                     (
                       SELECT ELEMENT [
                       FieldAccessor [
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 39615a7..9545fb1 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
@@ -206,7 +206,7 @@
                   )
 
                 Orderby
-                  FunctionCall fuzzyjoin.count@1[
+                  FunctionCall fuzzyjoin.sql-count@1[
                     (
                       SELECT ELEMENT [
                       FieldAccessor [
@@ -314,7 +314,7 @@
                   )
 
                 Orderby
-                  FunctionCall fuzzyjoin.count@1[
+                  FunctionCall fuzzyjoin.sql-count@1[
                     (
                       SELECT ELEMENT [
                       FieldAccessor [
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 adcea8c..44ac6dd 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
@@ -159,7 +159,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
@@ -267,7 +267,7 @@
               )
 
             Orderby
-              FunctionCall fuzzyjoin.count@1[
+              FunctionCall fuzzyjoin.sql-count@1[
                 (
                   SELECT ELEMENT [
                   FieldAccessor [
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 8861040..1795281 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall OpenSocialNetworkData.count@1[
+    FunctionCall OpenSocialNetworkData.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
index 02f9822..df48810 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
@@ -3,7 +3,7 @@
 SELECT ELEMENT [
 OrderedListConstructor [
   Variable [ Name=$m ]
-  FunctionCall test.count@1[
+  FunctionCall test.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 1c929d1..bc1cbb8 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall test.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 54ebc42..94a37bf 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall test.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-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/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
index 2132679..5e4e36a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-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/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
@@ -50,7 +50,7 @@
 
 Let Variable [ Name=$count ]
   :=
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
index 2132679..5e4e36a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
@@ -50,7 +50,7 @@
 
 Let Variable [ Name=$count ]
   :=
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
index 2132679..5e4e36a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
@@ -50,7 +50,7 @@
 
 Let Variable [ Name=$count ]
   :=
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 913613a..acb1510 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall test.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 b4027ee..6954f35 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall test.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 93ec923..19503b9 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
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall test.count@1[
+    FunctionCall test.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 0ff73a8..0d3c61e 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
@@ -21,7 +21,7 @@
         (
           LiteralExpr [STRING] [item_count]
           :
-          FunctionCall multitask.count@1[
+          FunctionCall multitask.sql-count@1[
             (
               SELECT ELEMENT [
               FieldAccessor [
@@ -74,7 +74,7 @@
       Orderby
         Variable [ Name=$subgid ]
         ASC
-        FunctionCall multitask.count@1[
+        FunctionCall multitask.sql-count@1[
           (
             SELECT ELEMENT [
             FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.ast
new file mode 100644
index 0000000..d177b74
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/aggregate.27.ast
@@ -0,0 +1,105 @@
+DataverseUse TinySocial
+Query:
+SELECT [
+FunctionCall TinySocial.sql-avg@1[
+  (
+    SELECT ELEMENT [
+    FunctionCall TinySocial.get-year@1[
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=employment
+        ]
+        Field=end-date
+      ]
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#2 ]
+    ]
+  )
+]
+average
+FunctionCall TinySocial.sql-count@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#3 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#3 ]
+    ]
+  )
+]
+count
+FunctionCall TinySocial.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FunctionCall TinySocial.get-year@1[
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#4 ]
+          Field=employment
+        ]
+        Field=end-date
+      ]
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#4 ]
+    ]
+  )
+]
+sum
+FunctionCall TinySocial.sql-min@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#5 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#5 ]
+    ]
+  )
+]
+min
+FunctionCall TinySocial.sql-max@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#6 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#6 ]
+    ]
+  )
+]
+max
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [FacebookUsers]
+  ]
+  AS Variable [ Name=$fbu ]
+,
+  FieldAccessor [
+    Variable [ Name=$fbu ]
+    Field=employment
+  ]
+  AS Variable [ Name=$employment ]
+]
+Group All
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.ast
new file mode 100644
index 0000000..db9a752
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/group-by.26.ast
@@ -0,0 +1,119 @@
+DataverseUse TinySocial
+Query:
+SELECT [
+Variable [ Name=$org ]
+organization
+FunctionCall TinySocial.sql-avg@1[
+  (
+    SELECT ELEMENT [
+    FunctionCall TinySocial.get-year@1[
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#2 ]
+          Field=employment
+        ]
+        Field=end-date
+      ]
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#2 ]
+    ]
+  )
+]
+average
+FunctionCall TinySocial.sql-count@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#3 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#3 ]
+    ]
+  )
+]
+count
+FunctionCall TinySocial.sql-sum@1[
+  (
+    SELECT ELEMENT [
+    FunctionCall TinySocial.get-year@1[
+      FieldAccessor [
+        FieldAccessor [
+          Variable [ Name=#4 ]
+          Field=employment
+        ]
+        Field=end-date
+      ]
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#4 ]
+    ]
+  )
+]
+sum
+FunctionCall TinySocial.sql-min@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#5 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#5 ]
+    ]
+  )
+]
+min
+FunctionCall TinySocial.sql-max@1[
+  (
+    SELECT ELEMENT [
+    FieldAccessor [
+      FieldAccessor [
+        Variable [ Name=#6 ]
+        Field=employment
+      ]
+      Field=end-date
+    ]
+    ]
+    FROM [      Variable [ Name=#1 ]
+      AS Variable [ Name=#6 ]
+    ]
+  )
+]
+max
+]
+FROM [  FunctionCall Metadata.dataset@1[
+    LiteralExpr [STRING] [FacebookUsers]
+  ]
+  AS Variable [ Name=$fbu ]
+,
+  FieldAccessor [
+    Variable [ Name=$fbu ]
+    Field=employment
+  ]
+  AS Variable [ Name=$employment ]
+]
+Groupby
+  Variable [ Name=$org ]
+  :=
+  FieldAccessor [
+    Variable [ Name=$employment ]
+    Field=organization-name
+  ]
+  GROUP AS Variable [ Name=#1 ]
+  (
+    employment:=Variable [ Name=$employment ]
+    fbu:=Variable [ Name=$fbu ]
+  )
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1263.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1263.23.ast
index 8cda2fd..803e76b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1263.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/query-ASTERIXDB-1263.23.ast
@@ -3,7 +3,7 @@
 SELECT [
 Variable [ Name=$h ]
 hour
-FunctionCall TinySocial.count@1[
+FunctionCall TinySocial.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -21,7 +21,7 @@
   SELECT [
   Variable [ Name=$min ]
   minute
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
index 616b9e4..c65459c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall TinySocial.count@1[
+    FunctionCall TinySocial.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
index 616b9e4..c65459c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall TinySocial.count@1[
+    FunctionCall TinySocial.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
index aa4bb0b..31e278b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
@@ -36,7 +36,7 @@
 
 Let Variable [ Name=$c ]
   :=
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/query-ASTERIXDB-1263.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/query-ASTERIXDB-1263.23.ast
index 8cda2fd..803e76b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/query-ASTERIXDB-1263.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/query-ASTERIXDB-1263.23.ast
@@ -3,7 +3,7 @@
 SELECT [
 Variable [ Name=$h ]
 hour
-FunctionCall TinySocial.count@1[
+FunctionCall TinySocial.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
@@ -21,7 +21,7 @@
   SELECT [
   Variable [ Name=$min ]
   minute
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
index 616b9e4..c65459c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall TinySocial.count@1[
+    FunctionCall TinySocial.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
index 616b9e4..c65459c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall TinySocial.count@1[
+    FunctionCall TinySocial.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
index aa4bb0b..31e278b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
@@ -36,7 +36,7 @@
 
 Let Variable [ Name=$c ]
   :=
-  FunctionCall TinySocial.count@1[
+  FunctionCall TinySocial.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
index ae8f04d..64187f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
@@ -166,7 +166,7 @@
   (
     LiteralExpr [STRING] [count_order]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
index e60c9f8..995cbbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
@@ -1,7 +1,7 @@
 DataverseUse tpch
 Query:
 SELECT [
-FunctionCall tpch.sum@1[
+FunctionCall tpch.sql-sum@1[
   (
     SELECT ELEMENT [
     OperatorExpr [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
index 648a33b..e882621 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
@@ -135,7 +135,7 @@
 
 Let Variable [ Name=$custdist ]
   :=
-  FunctionCall tpch.count@1[
+  FunctionCall tpch.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
index 4c84266..e184f80 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [t_count]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@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 5032a49..f6eaeaf 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
@@ -76,7 +76,7 @@
   (
     LiteralExpr [STRING] [numcust]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
index 9c0d26d..30df063 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
@@ -42,7 +42,7 @@
   (
     LiteralExpr [STRING] [count]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
index 653e7eb..e4d15d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
@@ -1,7 +1,7 @@
 DataverseUse tpch
 Query:
 SELECT [
-FunctionCall tpch.count@1[
+FunctionCall tpch.sql-count@1[
   (
     SELECT ELEMENT [
     FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
index 648a33b..e882621 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
@@ -135,7 +135,7 @@
 
 Let Variable [ Name=$custdist ]
   :=
-  FunctionCall tpch.count@1[
+  FunctionCall tpch.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 8da949a..cd588d6 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
@@ -439,7 +439,7 @@
 
 Let Variable [ Name=$numwait ]
   :=
-  FunctionCall tpch.count@1[
+  FunctionCall tpch.sql-count@1[
     (
       SELECT ELEMENT [
       FieldAccessor [
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 d53884c..fd595c3 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
@@ -179,7 +179,7 @@
   (
     LiteralExpr [STRING] [numcust]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
index b0c1038..ed17476 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
@@ -10,7 +10,7 @@
   (
     LiteralExpr [STRING] [count_order]
     :
-    FunctionCall tpch.count@1[
+    FunctionCall tpch.sql-count@1[
       (
         SELECT ELEMENT [
         FieldAccessor [
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 86d5822..3080027 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -2349,6 +2349,11 @@
         <output-dir compare="Text">core-05</output-dir>
       </compilation-unit>
     </test-case>
+    <test-case FilePath="group-by">
+      <compilation-unit name="null">
+        <output-dir compare="Text">null</output-dir>
+      </compilation-unit>
+    </test-case>
   </test-group>
   <test-group name="index-join">
     <test-case FilePath="index-join">
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 cbf05b5..6d19995 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
@@ -32,6 +32,7 @@
 public class FunctionMapUtil {
 
     private final static String CORE_AGGREGATE_PREFIX = "coll_";
+    private final static String SQL_PREFIX = "sql-";
 
     // Maps from a SQL function name to an AQL function name (i.e., AsterixDB internal name).
     private static final Map<String, String> FUNCTION_NAME_MAP = new HashMap<>();
@@ -94,7 +95,8 @@
         if (!isSql92AggregateFunction(fs)) {
             return fs;
         }
-        return new FunctionSignature(fs.getNamespace(), CORE_AGGREGATE_PREFIX + fs.getName(), fs.getArity());
+        return new FunctionSignature(fs.getNamespace(), CORE_AGGREGATE_PREFIX + SQL_PREFIX + fs.getName(),
+                fs.getArity());
     }
 
     /**
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
index 0b1eaca..0bf2841 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
@@ -877,6 +877,9 @@
         addPrivateFunction(INTERMEDIATE_AVG, LocalAvgTypeComputer.INSTANCE, true);
 
         addFunction(SQL_AVG, NullableDoubleTypeComputer.INSTANCE, true);
+        addPrivateFunction(GLOBAL_SQL_AVG, NullableDoubleTypeComputer.INSTANCE, true);
+        addPrivateFunction(LOCAL_SQL_AVG, LocalAvgTypeComputer.INSTANCE, true);
+        addPrivateFunction(INTERMEDIATE_SQL_AVG, LocalAvgTypeComputer.INSTANCE, true);
         addFunction(SQL_COUNT, AInt64TypeComputer.INSTANCE, true);
         addFunction(SQL_MAX, MinMaxAggTypeComputer.INSTANCE, true);
         addPrivateFunction(LOCAL_SQL_MAX, MinMaxAggTypeComputer.INSTANCE, true);
@@ -884,7 +887,7 @@
         addPrivateFunction(LOCAL_SQL_MIN, MinMaxAggTypeComputer.INSTANCE, true);
         addFunction(SQL_SUM, NumericAggTypeComputer.INSTANCE, true);
         addPrivateFunction(LOCAL_SQL_SUM, NumericAggTypeComputer.INSTANCE, true);
-        addFunction(SCALAR_SQL_AVG, ScalarVersionOfAggregateResultType.INSTANCE, true);
+        addFunction(SCALAR_SQL_AVG, NullableDoubleTypeComputer.INSTANCE, true);
         addFunction(SCALAR_SQL_COUNT, AInt64TypeComputer.INSTANCE, true);
         addPrivateFunction(SCALAR_GLOBAL_SQL_AVG, ScalarVersionOfAggregateResultType.INSTANCE, true);
         addPrivateFunction(SCALAR_LOCAL_SQL_AVG, ScalarVersionOfAggregateResultType.INSTANCE, true);
@@ -1410,4 +1413,4 @@
         return similarityFunctions.contains(getAsterixFunctionInfo(fi));
     }
 
-}
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java
index e403107..66e1af7 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java
@@ -234,8 +234,8 @@
                 break;
             }
             default: {
-                throw new AlgebricksException("Global-Avg is not defined for values of type "
-                        + EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(serBytes[0]));
+                throw new AlgebricksException("Intermediate/global-Avg is not defined for values of type "
+                        + EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(serBytes[offset]));
             }
         }
     }
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlAvgAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlAvgAggregateFunction.java
index dda677a..fd25d4d 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlAvgAggregateFunction.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlAvgAggregateFunction.java
@@ -44,7 +44,7 @@
 
     @Override
     public void finishPartial(IPointable result) throws AlgebricksException {
-        finish(result);
+        finishPartialResults(result);
     }
 
     @Override
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/AggregateFunctionCallExpression.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/AggregateFunctionCallExpression.java
index 67f285d..f09b4c2 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/AggregateFunctionCallExpression.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/expressions/AggregateFunctionCallExpression.java
@@ -21,24 +21,19 @@
 import java.util.List;
 
 import org.apache.commons.lang3.mutable.Mutable;
-
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
 import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
 import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
 
 /**
- *
  * An aggregate function may be executed in a "two step" mode. First the
  * "step-one" aggregates are run and then the results are passed to the
  * "step-two" aggregators. The convention is the following:
- *
  * 1. The step-one aggregate must be able to accept the same arguments as the
  * original aggregate function call.
- *
  * 2. The step-two aggregate must be a unary function that accepts as input the
  * output of the step-one aggregate.
- *
  */
 
 public class AggregateFunctionCallExpression extends AbstractFunctionCallExpression {
@@ -47,23 +42,12 @@
     private IFunctionInfo stepOneAggregate;
     private IFunctionInfo stepTwoAggregate;
 
-    public AggregateFunctionCallExpression(IFunctionInfo finfo, boolean isTwoStep) {
-        super(FunctionKind.AGGREGATE, finfo);
-        this.twoStep = isTwoStep;
-    }
-
     public AggregateFunctionCallExpression(IFunctionInfo finfo, boolean isTwoStep,
             List<Mutable<ILogicalExpression>> arguments) {
         super(FunctionKind.AGGREGATE, finfo, arguments);
         this.twoStep = isTwoStep;
     }
 
-    public AggregateFunctionCallExpression(IFunctionInfo finfo, boolean isTwoStep,
-            Mutable<ILogicalExpression>... expressions) {
-        super(FunctionKind.AGGREGATE, finfo, expressions);
-        this.twoStep = isTwoStep;
-    }
-
     public boolean isTwoStep() {
         return twoStep;
     }