diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg.sqlpp
index 7583275..6101707 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg.sqlpp
@@ -1,6 +1,6 @@
 use experiments;
 
-select element coll_avg((
+select element array_avg((
 select element "string-length"(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2013-07-16T14:31:31') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-3-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-3-months.sqlpp
index d7a19ea..0c5cba5 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-3-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-3-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2007-12-24T16:03:59') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-6-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-6-months.sqlpp
index 4db9357..e562e96 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-6-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-6-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2013-07-16T14:31:31') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-day.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-day.sqlpp
index d15e32d..2d64c99 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-day.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-day.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2010-10-10T03:13:47') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-hour.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-hour.sqlpp
index ab607d7..43d7346 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-hour.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-hour.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2007-05-26T08:58:39') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-minute.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-minute.sqlpp
index f09aa03..d9b428a 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-minute.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-minute.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2001-05-10T12:16:12') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-month.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-month.sqlpp
index c69f63b..12bec95 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-month.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-month.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2007-03-01T21:43:22') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-week.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-week.sqlpp
index f9e2e1d..523d71a 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-week.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/agg-week.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-select element coll_avg((
+select element array_avg((
 select element `string-length`(g.message)
 from GleambookMessages as g
 where g.send_time > datetime('2008-10-10T21:33:13') and
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-3-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-3-months.sqlpp
index 7d0d52e..cd9cd45 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-3-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-3-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-6-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-6-months.sqlpp
index f667b55..8799563 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-6-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-6-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-day.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-day.sqlpp
index 38b1d1e..9161ad1 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-day.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-day.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-hour.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-hour.sqlpp
index ebf8f0a..d595678 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-hour.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-hour.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-minute.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-minute.sqlpp
index b858d87..b0b0d01 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-minute.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-minute.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-month.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-month.sqlpp
index 79ba6a4..d19fdca 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-month.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-month.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-week.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-week.sqlpp
index aa74f5d..e6bc45e 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-week.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin-week.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-3-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-3-months.sqlpp
index d32dc69..6aa0b37 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-3-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-3-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-6-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-6-months.sqlpp
index daa0e48..6cc6b74 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-6-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-6-months.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-day.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-day.sqlpp
index b9e9dbb..fca5e88 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-day.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-day.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-hour.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-hour.sqlpp
index f7301a3..8e1b54e 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-hour.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-hour.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-minute.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-minute.sqlpp
index 00234bd..3a20a3d 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-minute.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-minute.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-month.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-month.sqlpp
index 28ffcdb..34a1018 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-month.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-month.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-week.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-week.sqlpp
index 806f279..0215b5b 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-week.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/countjoin_index-week.sqlpp
@@ -18,7 +18,7 @@
  */
 use SocialNetworkData;
 
-coll_count(
+array_count(
  (
   select element {
   'uname': user.name,
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-3-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-3-months.sqlpp
index 59eeedf..c33b35a 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-3-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-3-months.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2004-04-21T04:24:26') and
       message.send_time < datetime('2004-07-20T04:24:26')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-6-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-6-months.sqlpp
index 82bffcd..2429518 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-6-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-6-months.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2003-06-04T05:29:58') and
       message.send_time < datetime('2003-12-01T05:29:58')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-day.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-day.sqlpp
index 1d0610b..a56b64a 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-day.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-day.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2011-08-06T12:22:42') and
       message.send_time < datetime('2011-08-07T12:22:42')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-hour.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-hour.sqlpp
index 1c88c87..9b927fa 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-hour.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-hour.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2004-03-25T01:06:02') and
       message.send_time < datetime('2004-03-25T02:06:02')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-minute.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-minute.sqlpp
index cada972..d062885 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-minute.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-minute.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2003-07-04T21:31:33') and
       message.send_time < datetime('2003-07-04T21:32:33')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-month.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-month.sqlpp
index 5bf21a2..4b6bc23 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-month.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-month.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2003-07-11T10:56:04') and
       message.send_time < datetime('2003-08-10T10:56:04')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-week.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-week.sqlpp
index 5655c12..2383b8b 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-week.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby-week.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from GleambookUsers as user,
      GleambookMessages as message
 where message.author_id = user.id and
       message.send_time >= datetime('2010-04-10T18:10:27') and
       message.send_time < datetime('2010-04-17T18:10:27')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-3-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-3-months.sqlpp
index 9dd7c93..b8a1f86 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-3-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-3-months.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2004-04-21T04:24:26') and
       message.send_time < datetime('2004-07-20T04:24:26')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-6-months.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-6-months.sqlpp
index ed201eb..5eb521f 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-6-months.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-6-months.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2003-06-04T05:29:58') and
       message.send_time < datetime('2003-12-01T05:29:58')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-day.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-day.sqlpp
index ae223e4..3e73634 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-day.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-day.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2011-08-06T12:22:42') and
       message.send_time < datetime('2011-08-07T12:22:42')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-hour.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-hour.sqlpp
index 5bb5421..411ae32 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-hour.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-hour.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2004-03-25T01:06:02') and
       message.send_time < datetime('2004-03-25T02:06:02')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-minute.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-minute.sqlpp
index 5c5c09c..e781aee 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-minute.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-minute.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2003-07-04T21:31:33') and
       message.send_time < datetime('2003-07-04T21:32:33')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-month.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-month.sqlpp
index c13874e..f3eb7e0 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-month.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-month.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2003-07-11T10:56:04') and
       message.send_time < datetime('2003-08-10T10:56:04')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;
 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-week.sqlpp b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-week.sqlpp
index cd375a3..c8e0328 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-week.sqlpp
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/aql/agg_bench/joingby_index-week.sqlpp
@@ -18,14 +18,14 @@
  */
 use SocialNetworkData;
 
-select uid as uid, c as coll_count
+select uid as uid, c as array_count
 from  GleambookMessages as message,
       GleambookUsers as user
 where message.author_id /*+ indexnl */ = user.id and
       message.send_time >= datetime('2010-04-10T18:10:27') and
       message.send_time < datetime('2010-04-17T18:10:27')
 group by user.id AS uid
-let c = coll_count(message)
+let c = array_count(message)
 order by c desc
 limit 10;