diff --git a/functions/difference_test.go b/functions/difference_test.go
index 78f518f498..105fdc6630 100644
--- a/functions/difference_test.go
+++ b/functions/difference_test.go
@@ -313,7 +313,7 @@ func TestDifference_Process(t *testing.T) {
 				Columns:     []string{"x", "y"},
 				NonNegative: true,
 			},
-			data: []query.Block{&executetest.Block{
+			data: []query.Table{&executetest.Table{
 				ColMeta: []query.ColMeta{
 					{Label: "_time", Type: query.TTime},
 					{Label: "x", Type: query.TFloat},
@@ -321,7 +321,7 @@ func TestDifference_Process(t *testing.T) {
 				},
 				Data: [][]interface{}{},
 			}},
-			want: []*executetest.Block{{
+			want: []*executetest.Table{{
 				ColMeta: []query.ColMeta{
 					{Label: "_time", Type: query.TTime},
 					{Label: "x", Type: query.TFloat},
@@ -336,7 +336,7 @@ func TestDifference_Process(t *testing.T) {
 				Columns:     []string{"x", "y"},
 				NonNegative: true,
 			},
-			data: []query.Block{&executetest.Block{
+			data: []query.Table{&executetest.Table{
 				ColMeta: []query.ColMeta{
 					{Label: "_time", Type: query.TTime},
 					{Label: "x", Type: query.TFloat},
@@ -346,7 +346,7 @@ func TestDifference_Process(t *testing.T) {
 					{execute.Time(3), 10.0, 20.0},
 				},
 			}},
-			want: []*executetest.Block{{
+			want: []*executetest.Table{{
 				ColMeta: []query.ColMeta{
 					{Label: "_time", Type: query.TTime},
 					{Label: "x", Type: query.TFloat},
diff --git a/functions/testdata/difference.in.csv b/functions/testdata/difference.in.csv
index c9f0399980..ebbfa4d10a 100644
--- a/functions/testdata/difference.in.csv
+++ b/functions/testdata/difference.in.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true,true,true
 #default,_result,,,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
 ,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,34.98234271799806,used_percent,disk,disk1s1,apfs,host.local,/
@@ -7,4 +7,4 @@
 ,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:46Z,34.982447293755506,used_percent,disk,disk1s1,apfs,host.local,/
 ,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:56Z,34.982447293755506,used_percent,disk,disk1s1,apfs,host.local,/
 ,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,34.98204153981662,used_percent,disk,disk1s1,apfs,host.local,/
-,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,34.982252364543626,used_percent,disk,disk1s1,apfs,host.local,/
\ No newline at end of file
+,,96,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,34.982252364543626,used_percent,disk,disk1s1,apfs,host.local,/
diff --git a/functions/testdata/difference.out.csv b/functions/testdata/difference.out.csv
index 4212fe8381..f3ae4a53e3 100644
--- a/functions/testdata/difference.out.csv
+++ b/functions/testdata/difference.out.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true,true,true
 #default,_result,,,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
 ,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0.000006692848479872282,used_percent,disk,disk1s1,apfs,host.local,/
diff --git a/functions/testdata/difference_one_value.in.csv b/functions/testdata/difference_one_value.in.csv
index 1f42dc30ea..bd049c5119 100644
--- a/functions/testdata/difference_one_value.in.csv
+++ b/functions/testdata/difference_one_value.in.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
-,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,1,usage_guest,cpu,cpu-total,host.local
\ No newline at end of file
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,1,usage_guest,cpu,cpu-total,host.local
diff --git a/functions/testdata/difference_one_value.out.csv b/functions/testdata/difference_one_value.out.csv
index 306e6d8da2..dc414a3db9 100644
--- a/functions/testdata/difference_one_value.out.csv
+++ b/functions/testdata/difference_one_value.out.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,0,,,,,usage_guest,cpu,cpu-total,host.local
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
 
diff --git a/functions/testdata/difference_panic.out.csv b/functions/testdata/difference_panic.out.csv
index ad2c99f5a6..085f3c29d9 100644
--- a/functions/testdata/difference_panic.out.csv
+++ b/functions/testdata/difference_panic.out.csv
@@ -1,10 +1,10 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,0,,,,,usage_guest,cpu,cpu-total,host.local
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
 
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,1,,,,,usage_guest_nice,cpu,cpu-total,host.local
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
 
diff --git a/functions/testdata/meta_query_fields.in.csv b/functions/testdata/meta_query_fields.in.csv
index 55eb3f7ebb..4e83a27736 100644
--- a/functions/testdata/meta_query_fields.in.csv
+++ b/functions/testdata/meta_query_fields.in.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
 ,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_guest,cpu,cpu-total,host.local
@@ -27,4 +27,4 @@
 ,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,0,usage_iowait,cpu,cpu-total,host.local
 ,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,0,usage_iowait,cpu,cpu-total,host.local
 ,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_irq,cpu,cpu-total,host.local
-,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
\ No newline at end of file
+,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
diff --git a/functions/testdata/meta_query_fields.out.csv b/functions/testdata/meta_query_fields.out.csv
index f9442b9422..8bb7d91502 100644
--- a/functions/testdata/meta_query_fields.out.csv
+++ b/functions/testdata/meta_query_fields.out.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,string,string
-#partition,false,false,false,false
+#group,false,false,false,false
 #default,_result,,,
 ,result,table,_field,_value
 ,,0,usage_guest,usage_guest
diff --git a/functions/testdata/meta_query_keys.in.csv b/functions/testdata/meta_query_keys.in.csv
index 55eb3f7ebb..4e83a27736 100644
--- a/functions/testdata/meta_query_keys.in.csv
+++ b/functions/testdata/meta_query_keys.in.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true
 #default,_result,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host
 ,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_guest,cpu,cpu-total,host.local
@@ -27,4 +27,4 @@
 ,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,0,usage_iowait,cpu,cpu-total,host.local
 ,,3,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,0,usage_iowait,cpu,cpu-total,host.local
 ,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,0,usage_irq,cpu,cpu-total,host.local
-,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
\ No newline at end of file
+,,4,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,0,usage_irq,cpu,cpu-total,host.local
diff --git a/functions/testdata/meta_query_keys.out.csv b/functions/testdata/meta_query_keys.out.csv
index b972551adf..b7f2bdfd8b 100644
--- a/functions/testdata/meta_query_keys.out.csv
+++ b/functions/testdata/meta_query_keys.out.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,string,string,string,string,string
-#partition,false,false,true,true,true,true,false
+#group,false,false,true,true,true,true,false
 #default,0,,,,,,
 ,result,table,_field,_measurement,cpu,host,_value
 ,,0,usage_guest,cpu,cpu-total,host.local,_field
@@ -34,7 +34,7 @@
 ,,4,usage_irq,cpu,cpu-total,host.local,host
 
 #datatype,string,long,string,string
-#partition,false,false,false,false
+#group,false,false,false,false
 #default,1,,,
 ,result,table,host,_value
 ,,0,host.local,host.local
diff --git a/functions/testdata/meta_query_measurements.in.csv b/functions/testdata/meta_query_measurements.in.csv
index 7cc60bf71e..1138773287 100644
--- a/functions/testdata/meta_query_measurements.in.csv
+++ b/functions/testdata/meta_query_measurements.in.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string,string,string
-#partition,false,false,false,false,false,false,true,true,true,true,true,true
+#group,false,false,false,false,false,false,true,true,true,true,true,true
 #default,_result,,,,,,,,,,,
 ,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
 ,,90,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,318324641792,free,disk,disk1s1,apfs,host.local,/
@@ -15,4 +15,4 @@
 ,,91,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,9223372036853184344,inodes_free,disk1,disk1s1,apfs,host.local,/
 ,,91,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,9223372036853184345,inodes_free,disk2,disk1s1,apfs,host.local,/
 ,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
-,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
\ No newline at end of file
+,,92,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,9223372036854775807,inodes_total,disk2,disk1s1,apfs,host.local,/
diff --git a/functions/testdata/meta_query_measurements.out.csv b/functions/testdata/meta_query_measurements.out.csv
index 5858804aca..f3b7cb7eda 100644
--- a/functions/testdata/meta_query_measurements.out.csv
+++ b/functions/testdata/meta_query_measurements.out.csv
@@ -1,5 +1,5 @@
 #datatype,string,long,string,string
-#partition,false,false,false,false
+#group,false,false,false,false
 #default,_result,,,
 ,result,table,_measurement,_value
 ,,0,disk,disk