diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
index 9663dae..fc52f75 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Wed Sep 13 00:59:57 2017", 
+    "build_date": "Wed Sep 13 01:40:59 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -23035,10 +23035,10 @@
         }, 
         {
             "direction": "ingress", 
-            "statistics_type": "packets", 
+            "statistics_type": "bytes", 
             "handle": 67108865, 
             "name": "ingress_port_counter", 
-            "byte_counter_resolution": 0, 
+            "byte_counter_resolution": 32, 
             "table_type": "statistics", 
             "stage_tables": [
                 {
@@ -23071,17 +23071,17 @@
                 }
             ], 
             "enable_pfe": true, 
-            "packet_counter_resolution": 32, 
+            "packet_counter_resolution": 0, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
             "size": 512
         }, 
         {
             "direction": "ingress", 
-            "statistics_type": "packets", 
+            "statistics_type": "bytes", 
             "handle": 67108866, 
             "name": "egress_port_counter", 
-            "byte_counter_resolution": 0, 
+            "byte_counter_resolution": 32, 
             "table_type": "statistics", 
             "stage_tables": [
                 {
@@ -23114,7 +23114,7 @@
                 }
             ], 
             "enable_pfe": true, 
-            "packet_counter_resolution": 32, 
+            "packet_counter_resolution": 0, 
             "pfe_bit_position": 19, 
             "how_referenced": "indirect", 
             "size": 512
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
index f4b8f76..b1814d5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
@@ -1,7 +1,7 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Wed Sep 13 00:59:57 2017", 
+    "BuildDate": "Wed Sep 13 01:40:59 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
@@ -25618,7 +25618,7 @@
                     "entry_number": 0, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 0, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25630,7 +25630,7 @@
                     "entry_number": 1, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 32, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25642,7 +25642,7 @@
                     "entry_number": 2, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 64, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25654,7 +25654,7 @@
                     "entry_number": 3, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 96, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25681,15 +25681,15 @@
                 }
               ]
             }, 
-            "pkt_width": 32, 
-            "byte_width": 0, 
+            "pkt_width": 0, 
+            "byte_width": 32, 
             "stage_table_handle": 0, 
             "how_referenced": "indirect", 
-            "stat_type": "packets", 
+            "stat_type": "bytes", 
             "default_lower_huffman_bits_included": 0
           }
         ], 
-        "statistics_type": "packets", 
+        "statistics_type": "bytes", 
         "statistics_precision": 32, 
         "lrt_enable": true, 
         "saturating": false, 
@@ -25726,7 +25726,7 @@
                     "entry_number": 0, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 0, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25738,7 +25738,7 @@
                     "entry_number": 1, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 32, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25750,7 +25750,7 @@
                     "entry_number": 2, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 64, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25762,7 +25762,7 @@
                     "entry_number": 3, 
                     "field_list": [
                       {
-                        "name": "packets_0", 
+                        "name": "bytes_0", 
                         "start_offset": 96, 
                         "start_bit": 0, 
                         "bit_width": 32, 
@@ -25789,15 +25789,15 @@
                 }
               ]
             }, 
-            "pkt_width": 32, 
-            "byte_width": 0, 
+            "pkt_width": 0, 
+            "byte_width": 32, 
             "stage_table_handle": 1, 
             "how_referenced": "indirect", 
-            "stat_type": "packets", 
+            "stat_type": "bytes", 
             "default_lower_huffman_bits_included": 0
           }
         ], 
-        "statistics_type": "packets", 
+        "statistics_type": "bytes", 
         "statistics_precision": 32, 
         "lrt_enable": true, 
         "saturating": false,