diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
index 4f05f0a..57f4c85 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Fri Sep  8 08:26:24 2017", 
+    "build_date": "Tue Sep 12 11:17:02 2017", 
     "phv_allocation": [
         {
             "ingress": [
@@ -84,7 +84,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -164,7 +164,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -270,7 +270,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -311,7 +311,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -362,7 +362,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -408,13 +408,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -531,7 +531,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -676,7 +676,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -693,7 +693,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -814,7 +814,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -831,7 +831,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -1603,7 +1603,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -1683,7 +1683,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -1789,7 +1789,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -1830,7 +1830,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -1881,7 +1881,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -1927,13 +1927,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -2050,7 +2050,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -2195,7 +2195,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -2212,7 +2212,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -2333,7 +2333,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -2350,7 +2350,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -3122,7 +3122,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -3202,7 +3202,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -3308,7 +3308,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -3349,7 +3349,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -3400,7 +3400,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -3446,13 +3446,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -3569,7 +3569,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -3714,7 +3714,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -3731,7 +3731,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -3852,7 +3852,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -3869,7 +3869,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -4641,7 +4641,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -4721,7 +4721,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -4827,7 +4827,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -4868,7 +4868,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -4919,7 +4919,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -4965,13 +4965,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -5088,7 +5088,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -5233,7 +5233,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -5250,7 +5250,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -5371,7 +5371,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -5388,7 +5388,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -6160,7 +6160,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -6240,7 +6240,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -6346,7 +6346,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -6387,7 +6387,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -6438,7 +6438,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -6484,13 +6484,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -6607,7 +6607,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -6752,7 +6752,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -6769,7 +6769,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -6890,7 +6890,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -6907,7 +6907,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -7679,7 +7679,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -7759,7 +7759,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -7865,7 +7865,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -7906,7 +7906,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -7957,7 +7957,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -8003,13 +8003,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -8126,7 +8126,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -8271,7 +8271,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -8288,7 +8288,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -8409,7 +8409,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -8426,7 +8426,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -9198,7 +9198,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -9278,7 +9278,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -9384,7 +9384,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -9425,7 +9425,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -9476,7 +9476,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -9522,13 +9522,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -9645,7 +9645,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -9790,7 +9790,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -9807,7 +9807,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -9928,7 +9928,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -9945,7 +9945,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -10717,7 +10717,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -10797,7 +10797,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -10903,7 +10903,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -10944,7 +10944,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -10995,7 +10995,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -11041,13 +11041,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -11164,7 +11164,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -11309,7 +11309,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -11326,7 +11326,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -11447,7 +11447,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -11464,7 +11464,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -12236,7 +12236,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -12316,7 +12316,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -12422,7 +12422,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -12463,7 +12463,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -12514,7 +12514,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -12560,13 +12560,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -12683,7 +12683,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -12828,7 +12828,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -12845,7 +12845,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -12966,7 +12966,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -12983,7 +12983,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -13755,7 +13755,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -13835,7 +13835,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -13941,7 +13941,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -13982,7 +13982,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -14033,7 +14033,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -14079,13 +14079,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -14202,7 +14202,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -14347,7 +14347,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -14364,7 +14364,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -14485,7 +14485,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -14502,7 +14502,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -15274,7 +15274,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -15354,7 +15354,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -15460,7 +15460,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -15501,7 +15501,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -15552,7 +15552,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -15598,13 +15598,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -15721,7 +15721,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -15866,7 +15866,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -15883,7 +15883,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -16004,7 +16004,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -16021,7 +16021,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -16793,7 +16793,7 @@
                     "records": [
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 39, 
@@ -16873,7 +16873,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 47, 
@@ -16979,7 +16979,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 32, 
+                            "position_offset": 30, 
                             "phv_lsb": 15, 
                             "is_pov": false, 
                             "field_msb": 0, 
@@ -17020,7 +17020,7 @@
                         }, 
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 33, 
+                            "position_offset": 31, 
                             "phv_lsb": 7, 
                             "is_pov": false, 
                             "field_msb": 8, 
@@ -17071,7 +17071,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 22, 
+                            "position_offset": 20, 
                             "phv_lsb": 8, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -17117,13 +17117,13 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 20, 
+                            "position_offset": 36, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
                             "phv_msb": 15, 
                             "is_compiler_generated": false, 
-                            "field_name": "ecmp_metadata_groupId", 
+                            "field_name": "ecmp_metadata_group_id", 
                             "field_width": 2, 
                             "field_lsb": 0
                         }
@@ -17240,7 +17240,7 @@
                         }, 
                         {
                             "word_bit_width": 32, 
-                            "position_offset": 37, 
+                            "position_offset": 35, 
                             "phv_lsb": 16, 
                             "is_pov": false, 
                             "field_msb": 5, 
@@ -17385,7 +17385,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -17402,7 +17402,7 @@
                     "records": [
                         {
                             "word_bit_width": 8, 
-                            "position_offset": 35, 
+                            "position_offset": 33, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 7, 
@@ -17523,7 +17523,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 31, 
@@ -17540,7 +17540,7 @@
                     "records": [
                         {
                             "word_bit_width": 16, 
-                            "position_offset": 28, 
+                            "position_offset": 26, 
                             "phv_lsb": 0, 
                             "is_pov": false, 
                             "field_msb": 15, 
@@ -18851,7 +18851,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 112, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18864,7 +18864,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 96, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18877,7 +18877,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 80, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18890,7 +18890,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 64, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18903,7 +18903,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 48, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18916,7 +18916,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 32, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18929,7 +18929,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 16, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }, 
@@ -18942,7 +18942,7 @@
                                             "lsb_mem_word_idx": 0, 
                                             "source": "spec", 
                                             "lsb_mem_word_offset": 0, 
-                                            "field_name": "groupId"
+                                            "field_name": "group_id"
                                         }
                                     ]
                                 }
@@ -19338,7 +19338,7 @@
                     "p4_parameters": [
                         {
                             "position": 0, 
-                            "name": "groupId", 
+                            "name": "group_id", 
                             "start_bit": 0, 
                             "bit_width": 16
                         }
@@ -19436,7 +19436,7 @@
                     "p4_parameters": [
                         {
                             "position": 0, 
-                            "name": "groupId", 
+                            "name": "group_id", 
                             "start_bit": 0, 
                             "bit_width": 16
                         }
@@ -20612,61 +20612,61 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -20696,43 +20696,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -20774,49 +20774,49 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }
@@ -20852,43 +20852,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -20912,61 +20912,61 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -20996,31 +20996,31 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -21068,55 +21068,55 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -21152,43 +21152,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }
@@ -21230,19 +21230,19 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -21290,25 +21290,25 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }
@@ -21350,67 +21350,67 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -21452,31 +21452,31 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }
@@ -21512,43 +21512,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -21590,37 +21590,37 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }
@@ -21674,49 +21674,49 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -21746,49 +21746,49 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -21830,55 +21830,55 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -21920,55 +21920,55 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }
@@ -22016,37 +22016,37 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }
@@ -22076,31 +22076,31 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }
@@ -22130,61 +22130,61 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -22208,49 +22208,49 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -22280,43 +22280,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -22346,49 +22346,49 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }
@@ -22424,61 +22424,61 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }
@@ -22514,55 +22514,55 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -22598,61 +22598,61 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 16, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 0, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 17, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 1, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 30, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 14, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -22676,43 +22676,43 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 21, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 5, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }
@@ -22754,67 +22754,67 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 23, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 7, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 24, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 8, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 26, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 10, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 28, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 12, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 29, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 13, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 31, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 15, 
                                                 "hash_match_group": 0
                                             }
@@ -22862,37 +22862,37 @@
                                             }, 
                                             {
                                                 "hash_match_group_bit": 18, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 2, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 19, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 3, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 20, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 4, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 22, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 6, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 25, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 9, 
                                                 "hash_match_group": 0
                                             }, 
                                             {
                                                 "hash_match_group_bit": 27, 
-                                                "field_name": "ecmp_metadata_groupId", 
+                                                "field_name": "ecmp_metadata_group_id", 
                                                 "field_bit": 11, 
                                                 "hash_match_group": 0
                                             }
@@ -22961,7 +22961,7 @@
                                                         "source": "spec", 
                                                         "msb_mem_word_idx": 0, 
                                                         "lsb_mem_word_offset": 16, 
-                                                        "field_name": "ecmp_metadata_groupId", 
+                                                        "field_name": "ecmp_metadata_group_id", 
                                                         "enable_pfe": false
                                                     }, 
                                                     {
@@ -23047,7 +23047,7 @@
                                                         "source": "spec", 
                                                         "msb_mem_word_idx": 0, 
                                                         "lsb_mem_word_offset": 16, 
-                                                        "field_name": "ecmp_metadata_groupId", 
+                                                        "field_name": "ecmp_metadata_group_id", 
                                                         "enable_pfe": false
                                                     }, 
                                                     {
@@ -23133,7 +23133,7 @@
                                                         "source": "spec", 
                                                         "msb_mem_word_idx": 0, 
                                                         "lsb_mem_word_offset": 16, 
-                                                        "field_name": "ecmp_metadata_groupId", 
+                                                        "field_name": "ecmp_metadata_group_id", 
                                                         "enable_pfe": false
                                                     }, 
                                                     {
@@ -23184,7 +23184,7 @@
                     "start_bit": 0, 
                     "position": 0, 
                     "bit_width_full": 16, 
-                    "name": "ecmp_metadata_groupId"
+                    "name": "ecmp_metadata_group_id"
                 }, 
                 {
                     "bit_width": 16, 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
index 33c3d94..5d17e12 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/mau.context.json
@@ -1,7 +1,7 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Fri Sep  8 08:26:24 2017", 
+    "BuildDate": "Tue Sep 12 11:17:01 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
@@ -2016,7 +2016,7 @@
                               "SPECSTARTBIT": 0, 
                               "FIELDSB": 0, 
                               "MATCHMODE": null, 
-                              "FIELDNAME": "ecmp_metadata_groupId", 
+                              "FIELDNAME": "ecmp_metadata_group_id", 
                               "FIELDOFFSET": 16, 
                               "VALIDMATCHTYPE": null, 
                               "SPECLEN": 16, 
@@ -2112,7 +2112,7 @@
                               "SPECSTARTBIT": 0, 
                               "FIELDSB": 0, 
                               "MATCHMODE": null, 
-                              "FIELDNAME": "ecmp_metadata_groupId", 
+                              "FIELDNAME": "ecmp_metadata_group_id", 
                               "FIELDOFFSET": 16, 
                               "VALIDMATCHTYPE": null, 
                               "SPECLEN": 16, 
@@ -2208,7 +2208,7 @@
                               "SPECSTARTBIT": 0, 
                               "FIELDSB": 0, 
                               "MATCHMODE": null, 
-                              "FIELDNAME": "ecmp_metadata_groupId", 
+                              "FIELDNAME": "ecmp_metadata_group_id", 
                               "FIELDOFFSET": 16, 
                               "VALIDMATCHTYPE": null, 
                               "SPECLEN": 16, 
@@ -2343,7 +2343,7 @@
           {
             "MATCHTYPE": "exact", 
             "FIELDWIDTH": 16, 
-            "FIELDNAME": "ecmp_metadata_groupId", 
+            "FIELDNAME": "ecmp_metadata_group_id", 
             "STARTBIT": 0
           }, 
           {
@@ -3362,7 +3362,7 @@
         "ACTIONSPECFORMAT": [
           {
             "FIELDWIDTH": 16, 
-            "FIELDNAME": "groupId", 
+            "FIELDNAME": "group_id", 
             "STARTBIT": 0
           }
         ]
@@ -4640,7 +4640,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 0, 
                           "SOURCEWIDTH": 16
                         }
@@ -4658,7 +4658,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 16, 
                           "SOURCEWIDTH": 16
                         }
@@ -4676,7 +4676,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 32, 
                           "SOURCEWIDTH": 16
                         }
@@ -4694,7 +4694,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 48, 
                           "SOURCEWIDTH": 16
                         }
@@ -4712,7 +4712,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 64, 
                           "SOURCEWIDTH": 16
                         }
@@ -4730,7 +4730,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 80, 
                           "SOURCEWIDTH": 16
                         }
@@ -4748,7 +4748,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 96, 
                           "SOURCEWIDTH": 16
                         }
@@ -4766,7 +4766,7 @@
                           "WORDINDEX": 0, 
                           "MASKBITOFFSET": "NULL", 
                           "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "groupId", 
+                          "FIELDNAME": "group_id", 
                           "FIELDOFFSET": 112, 
                           "SOURCEWIDTH": 16
                         }
@@ -4919,7 +4919,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -4971,10 +4971,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -4999,7 +4999,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -5014,7 +5014,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -5029,7 +5029,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5154,7 +5154,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -5269,7 +5269,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -5284,7 +5284,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -5344,7 +5344,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5409,7 +5409,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -5505,7 +5505,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -6262,7 +6262,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -6314,10 +6314,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -6342,7 +6342,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -6357,7 +6357,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -6372,7 +6372,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6497,7 +6497,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -6612,7 +6612,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -6627,7 +6627,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -6687,7 +6687,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6752,7 +6752,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -6848,7 +6848,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -7605,7 +7605,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -7657,10 +7657,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -7685,7 +7685,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -7700,7 +7700,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -7715,7 +7715,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7840,7 +7840,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -7955,7 +7955,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -7970,7 +7970,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -8030,7 +8030,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8095,7 +8095,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -8191,7 +8191,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -8948,7 +8948,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -9000,10 +9000,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -9028,7 +9028,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -9043,7 +9043,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -9058,7 +9058,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9183,7 +9183,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -9298,7 +9298,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -9313,7 +9313,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -9373,7 +9373,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9438,7 +9438,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -9534,7 +9534,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -10291,7 +10291,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -10343,10 +10343,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -10371,7 +10371,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -10386,7 +10386,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -10401,7 +10401,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10526,7 +10526,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -10641,7 +10641,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -10656,7 +10656,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -10716,7 +10716,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10781,7 +10781,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -10877,7 +10877,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -11634,7 +11634,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -11686,10 +11686,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -11714,7 +11714,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -11729,7 +11729,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -11744,7 +11744,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11869,7 +11869,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -11984,7 +11984,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -11999,7 +11999,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -12059,7 +12059,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12124,7 +12124,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -12220,7 +12220,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -12977,7 +12977,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -13029,10 +13029,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -13057,7 +13057,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -13072,7 +13072,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -13087,7 +13087,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13212,7 +13212,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -13327,7 +13327,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -13342,7 +13342,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -13402,7 +13402,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13467,7 +13467,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -13563,7 +13563,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -14320,7 +14320,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -14372,10 +14372,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -14400,7 +14400,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -14415,7 +14415,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -14430,7 +14430,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14555,7 +14555,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -14670,7 +14670,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -14685,7 +14685,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -14745,7 +14745,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14810,7 +14810,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -14906,7 +14906,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -15663,7 +15663,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -15715,10 +15715,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -15743,7 +15743,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -15758,7 +15758,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -15773,7 +15773,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15898,7 +15898,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -16013,7 +16013,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -16028,7 +16028,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -16088,7 +16088,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16153,7 +16153,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -16249,7 +16249,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -17006,7 +17006,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -17058,10 +17058,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -17086,7 +17086,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -17101,7 +17101,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -17116,7 +17116,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -17241,7 +17241,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -17356,7 +17356,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -17371,7 +17371,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -17431,7 +17431,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -17496,7 +17496,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -17592,7 +17592,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -18349,7 +18349,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -18401,10 +18401,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -18429,7 +18429,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -18444,7 +18444,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -18459,7 +18459,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -18584,7 +18584,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -18699,7 +18699,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -18714,7 +18714,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -18774,7 +18774,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -18839,7 +18839,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -18935,7 +18935,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -19692,7 +19692,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 3
@@ -19744,10 +19744,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_groupId", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 20
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -19772,7 +19772,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 31
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -19787,7 +19787,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 324
@@ -19802,7 +19802,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 30
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -19927,7 +19927,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -20042,7 +20042,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -20057,7 +20057,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 33
                     }
                   ], 
                   "PHVNUMBER": 292
@@ -20117,7 +20117,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -20182,7 +20182,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 20
                     }
                   ], 
                   "PHVNUMBER": 65
@@ -20278,7 +20278,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -22363,7 +22363,7 @@
                     "entry_number": 7, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 0, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22375,7 +22375,7 @@
                     "entry_number": 6, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 16, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22387,7 +22387,7 @@
                     "entry_number": 5, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 32, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22399,7 +22399,7 @@
                     "entry_number": 4, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 48, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22411,7 +22411,7 @@
                     "entry_number": 3, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 64, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22423,7 +22423,7 @@
                     "entry_number": 2, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 80, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22435,7 +22435,7 @@
                     "entry_number": 1, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 96, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22447,7 +22447,7 @@
                     "entry_number": 0, 
                     "field_list": [
                       {
-                        "name": "groupId", 
+                        "name": "group_id", 
                         "start_offset": 112, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -22766,7 +22766,7 @@
               ], 
               "2": [
                 {
-                  "parameter_name": "groupId", 
+                  "parameter_name": "group_id", 
                   "location": "action_table", 
                   "parameter_least_significant_bit": 0, 
                   "parameter_most_significant_bit": 15, 
@@ -22819,7 +22819,7 @@
               ], 
               "4": [
                 {
-                  "parameter_name": "groupId", 
+                  "parameter_name": "group_id", 
                   "location": "action_table", 
                   "parameter_least_significant_bit": 0, 
                   "parameter_most_significant_bit": 15, 
@@ -22964,7 +22964,7 @@
             "override_stateful_full_addr": 0, 
             "p4_parameters": [
               {
-                "name": "groupId", 
+                "name": "group_id", 
                 "handle": 2, 
                 "start_offset": 0, 
                 "bit_width": 16, 
@@ -22978,14 +22978,14 @@
               {
                 "handle": 536870922, 
                 "destination_field": {
-                  "name": "ecmp_metadata.groupId", 
+                  "name": "ecmp_metadata.group_id", 
                   "start_offset": 0, 
                   "start_bit": 0, 
                   "bit_width": 16, 
                   "range_field": false
                 }, 
                 "source_value": {
-                  "name": "groupId", 
+                  "name": "group_id", 
                   "handle": 2, 
                   "start_offset": 0, 
                   "bit_width": 16, 
@@ -24428,7 +24428,7 @@
             "override_stateful_full_addr": 0, 
             "p4_parameters": [
               {
-                "name": "groupId", 
+                "name": "group_id", 
                 "handle": 2, 
                 "start_offset": 0, 
                 "bit_width": 16, 
@@ -24442,14 +24442,14 @@
               {
                 "handle": 536870922, 
                 "destination_field": {
-                  "name": "ecmp_metadata.groupId", 
+                  "name": "ecmp_metadata.group_id", 
                   "start_offset": 0, 
                   "start_bit": 0, 
                   "bit_width": 16, 
                   "range_field": false
                 }, 
                 "source_value": {
-                  "name": "groupId", 
+                  "name": "group_id", 
                   "handle": 2, 
                   "start_offset": 0, 
                   "bit_width": 16, 
@@ -24669,7 +24669,7 @@
                         "range_field": false
                       }, 
                       {
-                        "name": "ecmp_metadata.groupId", 
+                        "name": "ecmp_metadata.group_id", 
                         "start_offset": 96, 
                         "start_bit": 0, 
                         "bit_width": 16, 
@@ -24717,22 +24717,22 @@
                   "ecmp_metadata.selector[13]": 13, 
                   "ecmp_metadata.selector[14]": 14, 
                   "ecmp_metadata.selector[15]": 15, 
-                  "ecmp_metadata.groupId[0]": 16, 
-                  "ecmp_metadata.groupId[1]": 17, 
-                  "ecmp_metadata.groupId[2]": 18, 
-                  "ecmp_metadata.groupId[3]": 19, 
-                  "ecmp_metadata.groupId[4]": 20, 
-                  "ecmp_metadata.groupId[5]": 21, 
-                  "ecmp_metadata.groupId[6]": 22, 
-                  "ecmp_metadata.groupId[7]": 23, 
-                  "ecmp_metadata.groupId[8]": 24, 
-                  "ecmp_metadata.groupId[9]": 25, 
-                  "ecmp_metadata.groupId[10]": 26, 
-                  "ecmp_metadata.groupId[11]": 27, 
-                  "ecmp_metadata.groupId[12]": 28, 
-                  "ecmp_metadata.groupId[13]": 29, 
-                  "ecmp_metadata.groupId[14]": 30, 
-                  "ecmp_metadata.groupId[15]": 31
+                  "ecmp_metadata.group_id[0]": 16, 
+                  "ecmp_metadata.group_id[1]": 17, 
+                  "ecmp_metadata.group_id[2]": 18, 
+                  "ecmp_metadata.group_id[3]": 19, 
+                  "ecmp_metadata.group_id[4]": 20, 
+                  "ecmp_metadata.group_id[5]": 21, 
+                  "ecmp_metadata.group_id[6]": 22, 
+                  "ecmp_metadata.group_id[7]": 23, 
+                  "ecmp_metadata.group_id[8]": 24, 
+                  "ecmp_metadata.group_id[9]": 25, 
+                  "ecmp_metadata.group_id[10]": 26, 
+                  "ecmp_metadata.group_id[11]": 27, 
+                  "ecmp_metadata.group_id[12]": 28, 
+                  "ecmp_metadata.group_id[13]": 29, 
+                  "ecmp_metadata.group_id[14]": 30, 
+                  "ecmp_metadata.group_id[15]": 31
                 }, 
                 "match_group_match_bit_scrambling": {
                   "--entry-overhead-0----immediate--[0]": 0, 
@@ -24751,22 +24751,22 @@
                   "--entry-overhead-0----immediate--[13]": 13, 
                   "--entry-overhead-0----immediate--[14]": 14, 
                   "--entry-overhead-0----immediate--[15]": 15, 
-                  "--entry-0--ecmp_metadata.groupId[0]": 16, 
-                  "--entry-0--ecmp_metadata.groupId[1]": 17, 
-                  "--entry-0--ecmp_metadata.groupId[2]": 18, 
-                  "--entry-0--ecmp_metadata.groupId[3]": 19, 
-                  "--entry-0--ecmp_metadata.groupId[4]": 20, 
-                  "--entry-0--ecmp_metadata.groupId[5]": 21, 
-                  "--entry-0--ecmp_metadata.groupId[6]": 22, 
-                  "--entry-0--ecmp_metadata.groupId[7]": 23, 
-                  "--entry-0--ecmp_metadata.groupId[8]": 24, 
-                  "--entry-0--ecmp_metadata.groupId[9]": 25, 
-                  "--entry-0--ecmp_metadata.groupId[10]": 26, 
-                  "--entry-0--ecmp_metadata.groupId[11]": 27, 
-                  "--entry-0--ecmp_metadata.groupId[12]": 28, 
-                  "--entry-0--ecmp_metadata.groupId[13]": 29, 
-                  "--entry-0--ecmp_metadata.groupId[14]": 30, 
-                  "--entry-0--ecmp_metadata.groupId[15]": 31, 
+                  "--entry-0--ecmp_metadata.group_id[0]": 16, 
+                  "--entry-0--ecmp_metadata.group_id[1]": 17, 
+                  "--entry-0--ecmp_metadata.group_id[2]": 18, 
+                  "--entry-0--ecmp_metadata.group_id[3]": 19, 
+                  "--entry-0--ecmp_metadata.group_id[4]": 20, 
+                  "--entry-0--ecmp_metadata.group_id[5]": 21, 
+                  "--entry-0--ecmp_metadata.group_id[6]": 22, 
+                  "--entry-0--ecmp_metadata.group_id[7]": 23, 
+                  "--entry-0--ecmp_metadata.group_id[8]": 24, 
+                  "--entry-0--ecmp_metadata.group_id[9]": 25, 
+                  "--entry-0--ecmp_metadata.group_id[10]": 26, 
+                  "--entry-0--ecmp_metadata.group_id[11]": 27, 
+                  "--entry-0--ecmp_metadata.group_id[12]": 28, 
+                  "--entry-0--ecmp_metadata.group_id[13]": 29, 
+                  "--entry-0--ecmp_metadata.group_id[14]": 30, 
+                  "--entry-0--ecmp_metadata.group_id[15]": 31, 
                   "--entry-0--ecmp_metadata.selector[10]": 34, 
                   "--entry-0--ecmp_metadata.selector[11]": 35, 
                   "--entry-0--ecmp_metadata.selector[12]": 36, 
@@ -24903,7 +24903,7 @@
                             "range_field": false
                           }, 
                           {
-                            "name": "ecmp_metadata.groupId", 
+                            "name": "ecmp_metadata.group_id", 
                             "start_offset": 96, 
                             "start_bit": 0, 
                             "bit_width": 16, 
@@ -24987,7 +24987,7 @@
                             "range_field": false
                           }, 
                           {
-                            "name": "ecmp_metadata.groupId", 
+                            "name": "ecmp_metadata.group_id", 
                             "start_offset": 96, 
                             "start_bit": 0, 
                             "bit_width": 16, 
@@ -25071,7 +25071,7 @@
                             "range_field": false
                           }, 
                           {
-                            "name": "ecmp_metadata.groupId", 
+                            "name": "ecmp_metadata.group_id", 
                             "start_offset": 96, 
                             "start_bit": 0, 
                             "bit_width": 16, 
@@ -25152,22 +25152,22 @@
                   "ecmp_metadata.selector[13]": 13, 
                   "ecmp_metadata.selector[14]": 14, 
                   "ecmp_metadata.selector[15]": 15, 
-                  "ecmp_metadata.groupId[0]": 16, 
-                  "ecmp_metadata.groupId[1]": 17, 
-                  "ecmp_metadata.groupId[2]": 18, 
-                  "ecmp_metadata.groupId[3]": 19, 
-                  "ecmp_metadata.groupId[4]": 20, 
-                  "ecmp_metadata.groupId[5]": 21, 
-                  "ecmp_metadata.groupId[6]": 22, 
-                  "ecmp_metadata.groupId[7]": 23, 
-                  "ecmp_metadata.groupId[8]": 24, 
-                  "ecmp_metadata.groupId[9]": 25, 
-                  "ecmp_metadata.groupId[10]": 26, 
-                  "ecmp_metadata.groupId[11]": 27, 
-                  "ecmp_metadata.groupId[12]": 28, 
-                  "ecmp_metadata.groupId[13]": 29, 
-                  "ecmp_metadata.groupId[14]": 30, 
-                  "ecmp_metadata.groupId[15]": 31
+                  "ecmp_metadata.group_id[0]": 16, 
+                  "ecmp_metadata.group_id[1]": 17, 
+                  "ecmp_metadata.group_id[2]": 18, 
+                  "ecmp_metadata.group_id[3]": 19, 
+                  "ecmp_metadata.group_id[4]": 20, 
+                  "ecmp_metadata.group_id[5]": 21, 
+                  "ecmp_metadata.group_id[6]": 22, 
+                  "ecmp_metadata.group_id[7]": 23, 
+                  "ecmp_metadata.group_id[8]": 24, 
+                  "ecmp_metadata.group_id[9]": 25, 
+                  "ecmp_metadata.group_id[10]": 26, 
+                  "ecmp_metadata.group_id[11]": 27, 
+                  "ecmp_metadata.group_id[12]": 28, 
+                  "ecmp_metadata.group_id[13]": 29, 
+                  "ecmp_metadata.group_id[14]": 30, 
+                  "ecmp_metadata.group_id[15]": 31
                 }, 
                 "match_group_match_bit_scrambling": {
                   "--entry-overhead-0----immediate--[0]": 0, 
@@ -25186,22 +25186,22 @@
                   "--entry-overhead-0----immediate--[13]": 13, 
                   "--entry-overhead-0----immediate--[14]": 14, 
                   "--entry-overhead-0----immediate--[15]": 15, 
-                  "--entry-0--ecmp_metadata.groupId[0]": 16, 
-                  "--entry-0--ecmp_metadata.groupId[1]": 17, 
-                  "--entry-0--ecmp_metadata.groupId[2]": 18, 
-                  "--entry-0--ecmp_metadata.groupId[3]": 19, 
-                  "--entry-0--ecmp_metadata.groupId[4]": 20, 
-                  "--entry-0--ecmp_metadata.groupId[5]": 21, 
-                  "--entry-0--ecmp_metadata.groupId[6]": 22, 
-                  "--entry-0--ecmp_metadata.groupId[7]": 23, 
-                  "--entry-0--ecmp_metadata.groupId[8]": 24, 
-                  "--entry-0--ecmp_metadata.groupId[9]": 25, 
-                  "--entry-0--ecmp_metadata.groupId[10]": 26, 
-                  "--entry-0--ecmp_metadata.groupId[11]": 27, 
-                  "--entry-0--ecmp_metadata.groupId[12]": 28, 
-                  "--entry-0--ecmp_metadata.groupId[13]": 29, 
-                  "--entry-0--ecmp_metadata.groupId[14]": 30, 
-                  "--entry-0--ecmp_metadata.groupId[15]": 31, 
+                  "--entry-0--ecmp_metadata.group_id[0]": 16, 
+                  "--entry-0--ecmp_metadata.group_id[1]": 17, 
+                  "--entry-0--ecmp_metadata.group_id[2]": 18, 
+                  "--entry-0--ecmp_metadata.group_id[3]": 19, 
+                  "--entry-0--ecmp_metadata.group_id[4]": 20, 
+                  "--entry-0--ecmp_metadata.group_id[5]": 21, 
+                  "--entry-0--ecmp_metadata.group_id[6]": 22, 
+                  "--entry-0--ecmp_metadata.group_id[7]": 23, 
+                  "--entry-0--ecmp_metadata.group_id[8]": 24, 
+                  "--entry-0--ecmp_metadata.group_id[9]": 25, 
+                  "--entry-0--ecmp_metadata.group_id[10]": 26, 
+                  "--entry-0--ecmp_metadata.group_id[11]": 27, 
+                  "--entry-0--ecmp_metadata.group_id[12]": 28, 
+                  "--entry-0--ecmp_metadata.group_id[13]": 29, 
+                  "--entry-0--ecmp_metadata.group_id[14]": 30, 
+                  "--entry-0--ecmp_metadata.group_id[15]": 31, 
                   "--entry-0--ecmp_metadata.selector[10]": 34, 
                   "--entry-0--ecmp_metadata.selector[11]": 35, 
                   "--entry-0--ecmp_metadata.selector[12]": 36, 
@@ -25293,22 +25293,22 @@
                   "ecmp_metadata.selector[13]": 13, 
                   "ecmp_metadata.selector[14]": 14, 
                   "ecmp_metadata.selector[15]": 15, 
-                  "ecmp_metadata.groupId[0]": 16, 
-                  "ecmp_metadata.groupId[1]": 17, 
-                  "ecmp_metadata.groupId[2]": 18, 
-                  "ecmp_metadata.groupId[3]": 19, 
-                  "ecmp_metadata.groupId[4]": 20, 
-                  "ecmp_metadata.groupId[5]": 21, 
-                  "ecmp_metadata.groupId[6]": 22, 
-                  "ecmp_metadata.groupId[7]": 23, 
-                  "ecmp_metadata.groupId[8]": 24, 
-                  "ecmp_metadata.groupId[9]": 25, 
-                  "ecmp_metadata.groupId[10]": 26, 
-                  "ecmp_metadata.groupId[11]": 27, 
-                  "ecmp_metadata.groupId[12]": 28, 
-                  "ecmp_metadata.groupId[13]": 29, 
-                  "ecmp_metadata.groupId[14]": 30, 
-                  "ecmp_metadata.groupId[15]": 31
+                  "ecmp_metadata.group_id[0]": 16, 
+                  "ecmp_metadata.group_id[1]": 17, 
+                  "ecmp_metadata.group_id[2]": 18, 
+                  "ecmp_metadata.group_id[3]": 19, 
+                  "ecmp_metadata.group_id[4]": 20, 
+                  "ecmp_metadata.group_id[5]": 21, 
+                  "ecmp_metadata.group_id[6]": 22, 
+                  "ecmp_metadata.group_id[7]": 23, 
+                  "ecmp_metadata.group_id[8]": 24, 
+                  "ecmp_metadata.group_id[9]": 25, 
+                  "ecmp_metadata.group_id[10]": 26, 
+                  "ecmp_metadata.group_id[11]": 27, 
+                  "ecmp_metadata.group_id[12]": 28, 
+                  "ecmp_metadata.group_id[13]": 29, 
+                  "ecmp_metadata.group_id[14]": 30, 
+                  "ecmp_metadata.group_id[15]": 31
                 }, 
                 "match_group_match_bit_scrambling": {
                   "--entry-overhead-0----immediate--[0]": 0, 
@@ -25327,22 +25327,22 @@
                   "--entry-overhead-0----immediate--[13]": 13, 
                   "--entry-overhead-0----immediate--[14]": 14, 
                   "--entry-overhead-0----immediate--[15]": 15, 
-                  "--entry-0--ecmp_metadata.groupId[0]": 16, 
-                  "--entry-0--ecmp_metadata.groupId[1]": 17, 
-                  "--entry-0--ecmp_metadata.groupId[2]": 18, 
-                  "--entry-0--ecmp_metadata.groupId[3]": 19, 
-                  "--entry-0--ecmp_metadata.groupId[4]": 20, 
-                  "--entry-0--ecmp_metadata.groupId[5]": 21, 
-                  "--entry-0--ecmp_metadata.groupId[6]": 22, 
-                  "--entry-0--ecmp_metadata.groupId[7]": 23, 
-                  "--entry-0--ecmp_metadata.groupId[8]": 24, 
-                  "--entry-0--ecmp_metadata.groupId[9]": 25, 
-                  "--entry-0--ecmp_metadata.groupId[10]": 26, 
-                  "--entry-0--ecmp_metadata.groupId[11]": 27, 
-                  "--entry-0--ecmp_metadata.groupId[12]": 28, 
-                  "--entry-0--ecmp_metadata.groupId[13]": 29, 
-                  "--entry-0--ecmp_metadata.groupId[14]": 30, 
-                  "--entry-0--ecmp_metadata.groupId[15]": 31, 
+                  "--entry-0--ecmp_metadata.group_id[0]": 16, 
+                  "--entry-0--ecmp_metadata.group_id[1]": 17, 
+                  "--entry-0--ecmp_metadata.group_id[2]": 18, 
+                  "--entry-0--ecmp_metadata.group_id[3]": 19, 
+                  "--entry-0--ecmp_metadata.group_id[4]": 20, 
+                  "--entry-0--ecmp_metadata.group_id[5]": 21, 
+                  "--entry-0--ecmp_metadata.group_id[6]": 22, 
+                  "--entry-0--ecmp_metadata.group_id[7]": 23, 
+                  "--entry-0--ecmp_metadata.group_id[8]": 24, 
+                  "--entry-0--ecmp_metadata.group_id[9]": 25, 
+                  "--entry-0--ecmp_metadata.group_id[10]": 26, 
+                  "--entry-0--ecmp_metadata.group_id[11]": 27, 
+                  "--entry-0--ecmp_metadata.group_id[12]": 28, 
+                  "--entry-0--ecmp_metadata.group_id[13]": 29, 
+                  "--entry-0--ecmp_metadata.group_id[14]": 30, 
+                  "--entry-0--ecmp_metadata.group_id[15]": 31, 
                   "--entry-0--ecmp_metadata.selector[10]": 34, 
                   "--entry-0--ecmp_metadata.selector[11]": 35, 
                   "--entry-0--ecmp_metadata.selector[12]": 36, 
@@ -25434,22 +25434,22 @@
                   "ecmp_metadata.selector[13]": 13, 
                   "ecmp_metadata.selector[14]": 14, 
                   "ecmp_metadata.selector[15]": 15, 
-                  "ecmp_metadata.groupId[0]": 16, 
-                  "ecmp_metadata.groupId[1]": 17, 
-                  "ecmp_metadata.groupId[2]": 18, 
-                  "ecmp_metadata.groupId[3]": 19, 
-                  "ecmp_metadata.groupId[4]": 20, 
-                  "ecmp_metadata.groupId[5]": 21, 
-                  "ecmp_metadata.groupId[6]": 22, 
-                  "ecmp_metadata.groupId[7]": 23, 
-                  "ecmp_metadata.groupId[8]": 24, 
-                  "ecmp_metadata.groupId[9]": 25, 
-                  "ecmp_metadata.groupId[10]": 26, 
-                  "ecmp_metadata.groupId[11]": 27, 
-                  "ecmp_metadata.groupId[12]": 28, 
-                  "ecmp_metadata.groupId[13]": 29, 
-                  "ecmp_metadata.groupId[14]": 30, 
-                  "ecmp_metadata.groupId[15]": 31
+                  "ecmp_metadata.group_id[0]": 16, 
+                  "ecmp_metadata.group_id[1]": 17, 
+                  "ecmp_metadata.group_id[2]": 18, 
+                  "ecmp_metadata.group_id[3]": 19, 
+                  "ecmp_metadata.group_id[4]": 20, 
+                  "ecmp_metadata.group_id[5]": 21, 
+                  "ecmp_metadata.group_id[6]": 22, 
+                  "ecmp_metadata.group_id[7]": 23, 
+                  "ecmp_metadata.group_id[8]": 24, 
+                  "ecmp_metadata.group_id[9]": 25, 
+                  "ecmp_metadata.group_id[10]": 26, 
+                  "ecmp_metadata.group_id[11]": 27, 
+                  "ecmp_metadata.group_id[12]": 28, 
+                  "ecmp_metadata.group_id[13]": 29, 
+                  "ecmp_metadata.group_id[14]": 30, 
+                  "ecmp_metadata.group_id[15]": 31
                 }, 
                 "match_group_match_bit_scrambling": {
                   "--entry-overhead-0----immediate--[0]": 0, 
@@ -25468,22 +25468,22 @@
                   "--entry-overhead-0----immediate--[13]": 13, 
                   "--entry-overhead-0----immediate--[14]": 14, 
                   "--entry-overhead-0----immediate--[15]": 15, 
-                  "--entry-0--ecmp_metadata.groupId[0]": 16, 
-                  "--entry-0--ecmp_metadata.groupId[1]": 17, 
-                  "--entry-0--ecmp_metadata.groupId[2]": 18, 
-                  "--entry-0--ecmp_metadata.groupId[3]": 19, 
-                  "--entry-0--ecmp_metadata.groupId[4]": 20, 
-                  "--entry-0--ecmp_metadata.groupId[5]": 21, 
-                  "--entry-0--ecmp_metadata.groupId[6]": 22, 
-                  "--entry-0--ecmp_metadata.groupId[7]": 23, 
-                  "--entry-0--ecmp_metadata.groupId[8]": 24, 
-                  "--entry-0--ecmp_metadata.groupId[9]": 25, 
-                  "--entry-0--ecmp_metadata.groupId[10]": 26, 
-                  "--entry-0--ecmp_metadata.groupId[11]": 27, 
-                  "--entry-0--ecmp_metadata.groupId[12]": 28, 
-                  "--entry-0--ecmp_metadata.groupId[13]": 29, 
-                  "--entry-0--ecmp_metadata.groupId[14]": 30, 
-                  "--entry-0--ecmp_metadata.groupId[15]": 31, 
+                  "--entry-0--ecmp_metadata.group_id[0]": 16, 
+                  "--entry-0--ecmp_metadata.group_id[1]": 17, 
+                  "--entry-0--ecmp_metadata.group_id[2]": 18, 
+                  "--entry-0--ecmp_metadata.group_id[3]": 19, 
+                  "--entry-0--ecmp_metadata.group_id[4]": 20, 
+                  "--entry-0--ecmp_metadata.group_id[5]": 21, 
+                  "--entry-0--ecmp_metadata.group_id[6]": 22, 
+                  "--entry-0--ecmp_metadata.group_id[7]": 23, 
+                  "--entry-0--ecmp_metadata.group_id[8]": 24, 
+                  "--entry-0--ecmp_metadata.group_id[9]": 25, 
+                  "--entry-0--ecmp_metadata.group_id[10]": 26, 
+                  "--entry-0--ecmp_metadata.group_id[11]": 27, 
+                  "--entry-0--ecmp_metadata.group_id[12]": 28, 
+                  "--entry-0--ecmp_metadata.group_id[13]": 29, 
+                  "--entry-0--ecmp_metadata.group_id[14]": 30, 
+                  "--entry-0--ecmp_metadata.group_id[15]": 31, 
                   "--entry-0--ecmp_metadata.selector[10]": 34, 
                   "--entry-0--ecmp_metadata.selector[11]": 35, 
                   "--entry-0--ecmp_metadata.selector[12]": 36, 
@@ -25556,7 +25556,7 @@
         ], 
         "match_key_fields": [
           {
-            "name": "ecmp_metadata.groupId", 
+            "name": "ecmp_metadata.group_id", 
             "start_offset": 0, 
             "start_bit": 0, 
             "bit_width": 16, 
@@ -25571,7 +25571,7 @@
           }
         ], 
         "match_fields_type_dictionary": {
-          "ecmp_metadata.groupId": "exact", 
+          "ecmp_metadata.group_id": "exact", 
           "ecmp_metadata.selector": "exact"
         }, 
         "gateway_fields": [], 
@@ -26111,13 +26111,13 @@
         "ipv4_srcAddr": 4, 
         "udp_length_": 2, 
         "ipv4_protocol": 1, 
-        "ecmp_metadata_groupId": 2, 
         "ethernet_dstAddr": 6, 
         "tcp_ackNo": 4, 
         "ig_intr_md_resubmit_flag": 1, 
         "packet_in_hdr_ingress_port": 2, 
         "tcp_dstPort": 2, 
         "tcp_ctrl": 1, 
+        "ecmp_metadata_group_id": 2, 
         "tcp_srcPort": 2, 
         "ipv4_ihl": 1, 
         "ig_intr_md_for_tm_ucast_egress_port": 2, 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
index 713c01d..fb63358 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/p4_name_lookup.json
@@ -74,7 +74,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -132,7 +132,7 @@
                             "primitives": [
                                 {
                                     "dst": {
-                                        "name": "ecmp_metadata.groupId", 
+                                        "name": "ecmp_metadata.group_id", 
                                         "phv_allocation": [
                                             {
                                                 "field_instance_least_significant_bit": 0, 
@@ -147,7 +147,7 @@
                                     "name": "ModifyFieldPrimitive", 
                                     "src": [
                                         {
-                                            "name": "groupId", 
+                                            "name": "group_id", 
                                             "type": "action_param"
                                         }
                                     ]
@@ -417,7 +417,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -494,7 +494,7 @@
                         "65": "set_egress_port"
                     }, 
                     "match_fields": {
-                        "ecmp_metadata_groupId": [
+                        "ecmp_metadata_group_id": [
                             {
                                 "field_instance_least_significant_bit": 0, 
                                 "field_instance_most_significant_bit": 15, 
@@ -539,7 +539,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -649,7 +649,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -714,7 +714,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -779,7 +779,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -844,7 +844,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -909,7 +909,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -974,7 +974,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -1039,7 +1039,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -1104,7 +1104,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
@@ -1169,7 +1169,7 @@
                 "131": "I [ipv4.srcAddr[15:0]]", 
                 "132": "I [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]", 
                 "133": "I [ethernet.etherType]", 
-                "134": "I [ecmp_metadata.groupId]", 
+                "134": "I [ecmp_metadata.group_id]", 
                 "135": "I [ecmp_metadata.selector]", 
                 "144": "E [eg_intr_md._pad0, eg_intr_md.egress_port]", 
                 "256": "I [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]", 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
index 2cfaaae..b387dd4 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/context/phv.context.json
@@ -912,7 +912,7 @@
         {
           "data_lsb": 0, 
           "data_msb": 15, 
-          "name": "ecmp_metadata.groupId", 
+          "name": "ecmp_metadata.group_id", 
           "container_lsb": 0, 
           "container_msb": 15
         }
@@ -2512,6 +2512,15 @@
           "address": 1
         }
       ], 
+      "ecmp_metadata.group_id": [
+        {
+          "container_msb": 15, 
+          "data_lsb": 0, 
+          "data_msb": 15, 
+          "container_lsb": 0, 
+          "address": 134
+        }
+      ], 
       "tcp.ctrl": [
         {
           "container_msb": 21, 
@@ -2537,15 +2546,6 @@
           "address": 290
         }
       ], 
-      "ecmp_metadata.groupId": [
-        {
-          "container_msb": 15, 
-          "data_lsb": 0, 
-          "data_msb": 15, 
-          "container_lsb": 0, 
-          "address": 134
-        }
-      ], 
       "tcp.checksum": [
         {
           "container_msb": 31, 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
index 470c7b8..6bd3422 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.json
@@ -89,7 +89,7 @@
       "name" : "ecmp_metadata_t",
       "id" : 7,
       "fields" : [
-        ["groupId", 16, false],
+        ["group_id", 16, false],
         ["selector", 16, false]
       ]
     },
@@ -600,7 +600,7 @@
       "id" : 4,
       "runtime_data" : [
         {
-          "name" : "groupId",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -610,7 +610,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ecmp_metadata", "groupId"]
+              "value" : ["ecmp_metadata", "group_id"]
             },
             {
               "type" : "runtime_data",
@@ -621,7 +621,7 @@
             "filename" : "ecmp.p4",
             "line" : 39,
             "column" : 18,
-            "source_fragment" : "groupId) { ..."
+            "source_fragment" : "group_id) { ..."
           }
         },
         {
@@ -957,7 +957,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "target" : ["ecmp_metadata", "groupId"],
+              "target" : ["ecmp_metadata", "group_id"],
               "mask" : null
             },
             {
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.p4info b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.p4info
index f5f1111..ed07da5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.p4info
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/ecmp.p4info
@@ -6,7 +6,7 @@
   }
   match_fields {
     id: 1
-    name: "ecmp_metadata.groupId"
+    name: "ecmp_metadata.group_id"
     bitwidth: 16
     match_type: EXACT
   }
@@ -136,7 +136,7 @@
   }
   params {
     id: 1
-    name: "groupId"
+    name: "group_id"
     bitwidth: 16
   }
 }
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
index 30d3dc5..feb4272 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/asm.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: asm.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
index 5ecbe0e..7507e27 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -220,35 +220,35 @@
   entry_number : 7
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [127:112]
+       Field group_id [15:0]   : in bits [127:112]
   entry_number : 6
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [111:96]
+       Field group_id [15:0]   : in bits [111:96]
   entry_number : 5
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [95:80]
+       Field group_id [15:0]   : in bits [95:80]
   entry_number : 4
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [79:64]
+       Field group_id [15:0]   : in bits [79:64]
   entry_number : 3
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [63:48]
+       Field group_id [15:0]   : in bits [63:48]
   entry_number : 2
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [47:32]
+       Field group_id [15:0]   : in bits [47:32]
   entry_number : 1
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [31:16]
+       Field group_id [15:0]   : in bits [31:16]
   entry_number : 0
   field_list : [
     ]
-       Field groupId [15:0]   : in bits [15:0]
+       Field group_id [15:0]   : in bits [15:0]
 ]
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
index 498c30d..0e2f924 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.config.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Final Stage dependencies are:
@@ -864,11 +864,11 @@
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=2].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 2 to come from 16-bit PHV container 6.
-  That PHV byte contains {ecmp_metadata.groupId[7:0]}.
+  That PHV byte contains {ecmp_metadata.group_id[7:0]}.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_address to be 22.
 Configuring dp.xbar_hash.xbar.match_input_xbar_816b_ctl[word_group=0][output_byte=3].match_input_xbar_816b_ctl_enable to be 1.
 Configuring match input crossbar byte 3 to come from 16-bit PHV container 6.
-  That PHV byte contains {ecmp_metadata.groupId[15:8]}.
+  That PHV byte contains {ecmp_metadata.group_id[15:8]}.
 Configuring dp.match_input_xbar_din_power_ctl[14_byte_group=0][byte_position=8].match_input_xbar_din_power_ctl to be 0xc0.  (previous value = 0x0  OR new value = 0xc0)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=2].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
 Configuring dp.xbar_hash.hash.hash_seed[output_bit=3].hash_seed to be 0x1 (previous value = 0x0  OR  new value = 0x1)
@@ -1041,22 +1041,22 @@
   [13] =  (field_bit=13, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 13))
   [14] =  (field_bit=14, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 14))
   [15] =  (field_bit=15, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 15))
-  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 0))
-  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 1))
-  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 2))
-  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 3))
-  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 4))
-  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 5))
-  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 6))
-  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 7))
-  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 8))
-  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 9))
-  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 10))
-  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 11))
-  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 12))
-  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 13))
-  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 14))
-  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 15))
+  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 0))
+  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 1))
+  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 2))
+  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 3))
+  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 4))
+  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 5))
+  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 6))
+  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 7))
+  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 8))
+  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 9))
+  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 10))
+  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 11))
+  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 12))
+  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 13))
+  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 14))
+  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 15))
   [32] = None
   [33] = None
   [34] =  (field_bit=10, hash_match_group_bit=10, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.selector', 10))
@@ -1247,22 +1247,22 @@
   [13] =  (field_bit=13, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 13))
   [14] =  (field_bit=14, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 14))
   [15] =  (field_bit=15, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 15))
-  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 0))
-  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 1))
-  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 2))
-  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 3))
-  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 4))
-  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 5))
-  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 6))
-  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 7))
-  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 8))
-  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 9))
-  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 10))
-  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 11))
-  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 12))
-  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 13))
-  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 14))
-  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 15))
+  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 0))
+  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 1))
+  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 2))
+  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 3))
+  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 4))
+  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 5))
+  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 6))
+  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 7))
+  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 8))
+  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 9))
+  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 10))
+  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 11))
+  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 12))
+  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 13))
+  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 14))
+  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 15))
   [32] = None
   [33] = None
   [34] =  (field_bit=10, hash_match_group_bit=10, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.selector', 10))
@@ -1453,22 +1453,22 @@
   [13] =  (field_bit=13, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 13))
   [14] =  (field_bit=14, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 14))
   [15] =  (field_bit=15, hash_match_group_bit=-1, entry_in_ram_word=0, entry_in_wide_word=0, data_type=overhead, mg=0, field_tuple=('--entry-overhead-0----immediate--', 15))
-  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 0))
-  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 1))
-  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 2))
-  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 3))
-  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 4))
-  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 5))
-  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 6))
-  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 7))
-  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 8))
-  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 9))
-  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 10))
-  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 11))
-  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 12))
-  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 13))
-  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 14))
-  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.groupId', 15))
+  [16] =  (field_bit=0, hash_match_group_bit=16, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 0))
+  [17] =  (field_bit=1, hash_match_group_bit=17, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 1))
+  [18] =  (field_bit=2, hash_match_group_bit=18, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 2))
+  [19] =  (field_bit=3, hash_match_group_bit=19, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 3))
+  [20] =  (field_bit=4, hash_match_group_bit=20, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 4))
+  [21] =  (field_bit=5, hash_match_group_bit=21, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 5))
+  [22] =  (field_bit=6, hash_match_group_bit=22, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 6))
+  [23] =  (field_bit=7, hash_match_group_bit=23, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 7))
+  [24] =  (field_bit=8, hash_match_group_bit=24, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 8))
+  [25] =  (field_bit=9, hash_match_group_bit=25, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 9))
+  [26] =  (field_bit=10, hash_match_group_bit=26, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 10))
+  [27] =  (field_bit=11, hash_match_group_bit=27, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 11))
+  [28] =  (field_bit=12, hash_match_group_bit=28, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 12))
+  [29] =  (field_bit=13, hash_match_group_bit=29, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 13))
+  [30] =  (field_bit=14, hash_match_group_bit=30, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 14))
+  [31] =  (field_bit=15, hash_match_group_bit=31, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.group_id', 15))
   [32] = None
   [33] = None
   [34] =  (field_bit=10, hash_match_group_bit=10, entry_in_ram_word=0, entry_in_wide_word=0, data_type=match_data, mg=0, field_tuple=('--entry-0--ecmp_metadata.selector', 10))
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
index abe1470..e39e190 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gateway.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gateway.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 
@@ -757,7 +757,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7a2415a190>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7446718210>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -1126,7 +1126,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7a2370eb50>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [1], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f74466ffbd0>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table process_packet_out_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [1]) and hash group 0 for gateway 14.
@@ -2294,7 +2294,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7a27906250>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f744a26a2d0>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
@@ -2679,7 +2679,7 @@
 Gateway 14
 ------- Phase 0 -------------
 Looking at gateway table 14
-match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7a23e259d0>, 0)])), (1, (None, [], None, [], []))])
+match_groups_attached_to_gateway = OrderedDict([(0, (0, [0], 0, [0], [(<p4c_tofino.target.tofino.device.pipeline.mau.match_keys.packed_gateway_key.PackedGatewayKey object at 0x7f7446a9aa50>, 0)])), (1, (None, [], None, [], []))])
 Search bus 0 on row 7
 ----------------------------
  Trying to place Gateway Resource Request for table egress_port_count_table_always_true_condition needs access to 0 input bits in exact match group 0 (parity groups [0]) and hash group 0 for gateway 14.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
index cb1e05b..2a00faa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.gw.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.gw.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 cond _condition_0: not valid packet_out_hdr
@@ -16,7 +16,7 @@
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f7a28437c10>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -30,7 +30,7 @@
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f7a28437c10>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _condition_0: not valid packet_out_hdr
      not valid packet_out_hdr
@@ -44,7 +44,7 @@
 cond _condition_2 can be gateway (9+0)x1
 cond !_condition_2 can be gateway (9+0)x1
 _condition_2 is gateway for ingress_port_count_table
-fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f7a28437c10>]) and and xor_fields is OrderedSet()
+fields = OrderedSet([<p4_hlir.hlir.p4_headers.p4_field object at 0x7f744ad95cd0>]) and and xor_fields is OrderedSet()
 fields = OrderedSet() and and xor_fields is OrderedSet()
 cond _always_true: True == True
      True
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
index 4628e6b..3494ab0 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -219,8 +219,8 @@
 Overhead bit width for table ecmp_group_table is 0 bits.
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 
 ---------------------------------------------
 Call to can_any_match_key_fields_be_shared(stage=0, table=ecmp_group_table)
@@ -228,8 +228,8 @@
 Decided way to allocate for table ecmp_group_table in stage 0 WAS non_shared
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 Overhead SRAMs to use = 3
   Entries requested = 1024  and match entries get = 3072
 ram_size_matrix = 
@@ -276,8 +276,8 @@
 Overhead bit width for table ecmp_group_table is 0 bits.
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 
 ---------------------------------------------
 Call to can_any_match_key_fields_be_shared(stage=0, table=ecmp_group_table)
@@ -285,8 +285,8 @@
 Decided way to allocate for table ecmp_group_table in stage 0 WAS non_shared
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 Overhead SRAMs to use = 3
   Entries requested = 1024  and match entries get = 3072
 ram_size_matrix = 
@@ -331,8 +331,8 @@
 Overhead bit width for table ecmp_group_table is 0 bits.
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 
 ---------------------------------------------
 Call to can_any_match_key_fields_be_shared(stage=0, table=ecmp_group_table)
@@ -340,8 +340,8 @@
 Decided way to allocate for table ecmp_group_table in stage 0 WAS non_shared
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 Overhead SRAMs to use = 3
   Entries requested = 1024  and match entries get = 3072
 ram_size_matrix = 
@@ -386,8 +386,8 @@
 Overhead bit width for table ecmp_group_table is 0 bits.
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 
 ---------------------------------------------
 Call to can_any_match_key_fields_be_shared(stage=0, table=ecmp_group_table)
@@ -395,8 +395,8 @@
 Decided way to allocate for table ecmp_group_table in stage 0 WAS non_shared
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 Overhead SRAMs to use = 3
   Entries requested = 1024  and match entries get = 3072
 ram_size_matrix = 
@@ -971,8 +971,8 @@
 
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 
 ---------------------------------------------
 Call to can_any_match_key_fields_be_shared(stage=1, table=ecmp_group_table)
@@ -980,8 +980,8 @@
 Decided way to allocate for table ecmp_group_table in stage 1 WAS non_shared
 Allocating: Byte 0 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[7:0]}.
 Allocating: Byte 1 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.selector[15:8]}.
-Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[7:0]}.
-Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.groupId[15:8]}.
+Allocating: Byte 2 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[7:0]}.
+Allocating: Byte 3 is of type exact and member of group 0 (parity group 0) with 16 bytes. for {ecmp_metadata.group_id[15:8]}.
 Packing choices are:
 Choice 0
   entries_per_table_word : 1
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
index cf8d0f1..f845959 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.resources.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.resources.log                                        |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
index 9107514..92054d9 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.rf.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.rf.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
index 072047b..52527ff 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.sram.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.sram.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
index b2d4dcc..cd4e13b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tcam.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tcam.log                                             |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
index 61320e1..b314530 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/mau.tp.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.tp.log                                               |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 ----- Stage 0 ------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
index 2e1efbd..55dbc6a 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.characterize.log                                      |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -194,7 +194,7 @@
 |   phv133  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |         ethernet.etherType[15:0]         |  pkt  |  | W | R  | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~ | ~  | ~  | R |
 |   phv134  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
-|   [15:0]  | ingress |       ecmp_metadata.groupId[15:0]        |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
+|   [15:0]  | ingress |       ecmp_metadata.group_id[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
 |   phv135  | ingress |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
 |   [15:0]  | ingress |       ecmp_metadata.selector[15:0]       |  meta |  |   | W  | R |   |   |   |   |   |   |   |   |    |    |   |
 |   phv136  |    -    |                                          |       |  |   |    |   |   |   |   |   |   |   |   |   |    |    |   |
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
index f45834a..13d6041 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.constraints.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.constraints.log                                       |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 To populate this log file, include --print-pa-constraints as a compiler argument.
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
index 0401716..37549c5 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.liveness.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.liveness.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
index 4cab7bd..0eaf2fe 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.log                                                   |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 HLIR Version: 0.10.5
@@ -472,7 +472,7 @@
 |   --validity_check--packet_out_hdr  |     1     |  ingress  |    x    |     x     |           |      x       |       x       |
 |        --validity_check--tcp        |     1     |  ingress  |    x    |     x     |           |              |               |
 |        --validity_check--udp        |     1     |  ingress  |    x    |     x     |           |              |               |
-|        ecmp_metadata.groupId        |     16    |  ingress  |         |           |     x     |      x       |       x       |
+|        ecmp_metadata.group_id       |     16    |  ingress  |         |           |     x     |      x       |       x       |
 |        ecmp_metadata.selector       |     16    |  ingress  |         |           |     x     |      x       |       x       |
 |           ethernet.dstAddr          |     48    |  ingress  |    x    |     x     |           |      x       |               |
 |          ethernet.etherType         |     16    |  ingress  |    x    |     x     |           |      x       |               |
@@ -553,7 +553,7 @@
   parse_pkt_in and parse_pkt_out are exclusive parse states
   parse_tcp and parse_udp are exclusive parse states
 
->>Event 'pa_init' at time 1504859166.85
+>>Event 'pa_init' at time 1505215004.27
    Took 0.01 seconds
 --------------------------------------------
 PHV MAU Groups: 92
@@ -696,7 +696,7 @@
   udp.checksum <16 bits ingress parsed tagalong>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
-  ecmp_metadata.groupId <16 bits ingress meta R W>
+  ecmp_metadata.group_id <16 bits ingress meta R W>
 
 Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
   ecmp_metadata.selector <16 bits ingress meta R W>
@@ -837,7 +837,7 @@
   eg_intr_md.egress_cos <3 bits egress parsed imeta>
 
 
->>Event 'pa_resv' at time 1504859166.85
+>>Event 'pa_resv' at time 1505215004.27
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -879,7 +879,7 @@
   Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
   Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
 Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1504859166.89
+>>Event 'pa_bridge' at time 1505215004.31
    Took 0.04 seconds
 
 -----------------------------------------------
@@ -932,7 +932,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_phase0' at time 1504859166.89
+>>Event 'pa_phase0' at time 1505215004.31
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -985,7 +985,7 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_critical' at time 1504859166.90
+>>Event 'pa_critical' at time 1505215004.31
    Took 0.00 seconds
 
 -----------------------------------------------
@@ -2068,8 +2068,8 @@
 |     Overall total      |   52 (15.48%)   | 968 (15.76%) |      6144      |
 -----------------------------------------------------------------------------
 
->>Event 'pa_overlay' at time 1504859175.96
-   Took 9.06 seconds
+>>Event 'pa_overlay' at time 1505215013.40
+   Took 9.09 seconds
 
 -----------------------------------------------
   Allocating remaining parsed fields
@@ -2685,8 +2685,8 @@
 |     Overall total      |    1 (0.30%)    | 32 (0.52%) |      6144      |
 ---------------------------------------------------------------------------
 
->>Event 'pa_meta1' at time 1504859179.69
-   Took 3.73 seconds
+>>Event 'pa_meta1' at time 1505215017.16
+   Took 3.76 seconds
 
 -----------------------------------------------
   Allocating metadata (pass 1)
@@ -2841,7 +2841,7 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1504859179.79
+>>Event 'pa_pov' at time 1505215017.27
    Took 0.10 seconds
 
 -----------------------------------------------
@@ -2998,7 +2998,7 @@
  egress
     phv81 (8 bits)
   >> 8 total bits
->>Event 'pa_meta2' at time 1504859179.91
+>>Event 'pa_meta2' at time 1505215017.39
    Took 0.12 seconds
 
 -----------------------------------------------
@@ -3096,13 +3096,13 @@
 --------------------------------------------------------------------------
 
 Sorted metadata field instances to allocate: 3 / 35 bits (35 ingress bits and 0 egress bits)
-     0: ecmp_metadata.groupId (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
+     0: ecmp_metadata.group_id (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
      1: ecmp_metadata.selector (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
      2: ig_intr_md_for_tm.drop_ctl (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=2, best_share_pack=0, max_split=1, bit_width=3, initial_usage_read=2, earliest_use=0, latest_use=12)
 
 ---------------------------------------
 Working on:
-ecmp_metadata.groupId <16 bits ingress meta R W>
+ecmp_metadata.group_id <16 bits ingress meta R W>
 max_split = None, adj = None
 Of remaining metadata fields to allocate
    max_overlay = 0 (0 bits)
@@ -3112,12 +3112,12 @@
 min_parse_states = 1
 bits_per_state = 16
 Parse state 0 (16 bits)
-  ecmp_metadata.groupId [15:0]
---------------------------------------------------------------------------------------------
-|          Name         | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
---------------------------------------------------------------------------------------------
-| ecmp_metadata.groupId | 16 |   False   |  -  |  -   |     -     |   None   |     1      |
---------------------------------------------------------------------------------------------
+  ecmp_metadata.group_id [15:0]
+---------------------------------------------------------------------------------------------
+|          Name          | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
+---------------------------------------------------------------------------------------------
+| ecmp_metadata.group_id | 16 |   False   |  -  |  -   |     -     |   None   |     1      |
+---------------------------------------------------------------------------------------------
 
   req packing: [None]
   disallowed packing: [None]
@@ -3135,11 +3135,11 @@
   Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
   Group 12 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv192 -- fails False
   Group 13 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv208 -- fails False
-Metadata instance: ecmp_metadata.groupId <16 bits ingress meta R W>
+Metadata instance: ecmp_metadata.group_id <16 bits ingress meta R W>
 >>req_alignment = None
 >>allowed_container_start_bits = None
 >>req_container = None
-***Allocating phv134[15:0] for ecmp_metadata.groupId[15:0]
+***Allocating phv134[15:0] for ecmp_metadata.group_id[15:0]
 
 ---------------------------------------
 Working on:
@@ -3225,7 +3225,7 @@
     final start_bit = 5
   (1) msb_offset = 8
 ***Allocating phv68[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1504859180.07
+>>Event 'pa_meta_init' at time 1505215017.55
    Took 0.16 seconds
 
 -----------------------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
index 8a7bb15..2c662cf 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/pa.results.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: pa.results.log                                           |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Program: ecmp
@@ -105,7 +105,7 @@
   16-bit PHV 132 (ingress): phv132[15:8] = ethernet.dstAddr[7:0] (deparsed)
   16-bit PHV 132 (ingress): phv132[7:0] = ethernet.srcAddr[47:40] (deparsed)
   16-bit PHV 133 (ingress): phv133[15:0] = ethernet.etherType[15:0] (deparsed)
-  16-bit PHV 134 (ingress): phv134[15:0] = ecmp_metadata.groupId[15:0]
+  16-bit PHV 134 (ingress): phv134[15:0] = ecmp_metadata.group_id[15:0]
   16-bit PHV 135 (ingress): phv135[15:0] = ecmp_metadata.selector[15:0]
   >> 8 in ingress and 0 in egress
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
index 0e60adf..3377828 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.calcfields.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.calcfields.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Reserving 0 16-bit ingress tphvs for residual checksums
@@ -19,19 +19,19 @@
 Number of reachable states from state <POV initialization>_<Ingress intrinsic metadata>_<Phase 0> : 10
 Number of reachable states from state <Shim start state> : 11
 parser_state_calculations:[
-	parse_tcp_140162566980432
-	parse_tcp_140162565529552
-	parse_udp_140162565528592
-	parse_ipv4_140162562411728
-	parse_ethernet_140162562408656
-	parse_pkt_in_140162562411664
-	parse_pkt_out_140162565527504
-	default_parser_140162565527696
-	start_140162562410704
-	<Phase 0>_140162562277968
-	<Ingress intrinsic metadata>_140162562277648
-	<POV initialization>_140162562278352
-	<Shim start state>_140162562278672
+	parse_tcp_140137374004176
+	parse_tcp_140137367945424
+	parse_udp_140137367946384
+	parse_ipv4_140137373101392
+	parse_ethernet_140137373098256
+	parse_pkt_in_140137373101328
+	parse_pkt_out_140137367947472
+	default_parser_140137367947280
+	start_140137373100368
+	<Phase 0>_140137372910288
+	<Ingress intrinsic metadata>_140137372909968
+	<POV initialization>_140137372910672
+	<Shim start state>_140137372910992
 ]
 parser_calculations: [
 	
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
index 3bfe6a7..23dd4fa 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.config.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.config.log                                         |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -16133,7 +16133,7 @@
  131 | I g4w3:   [ipv4.srcAddr[15:0]]
  132 | I g4w4:   [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
  133 | I g4w5:   [ethernet.etherType]
- 134 | I g4w6:   [ecmp_metadata.groupId]
+ 134 | I g4w6:   [ecmp_metadata.group_id]
  135 | I g4w7:   [ecmp_metadata.selector]
  136 |   g4w8:   
  137 |   g4w9:   
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
index e6b473b..10e9c8b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.error.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.error.log                                          |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
index 1c409b9..c9e0bcf 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parde.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: parde.log                                                |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 ># Begin digest init (pre-PHV)
@@ -18,14 +18,14 @@
 ># Begin unroll of HLIR parse graph
 >## Create shadow parse graph and find loops
 >## Entrypoint 'p4_parse_state.start'
-Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140162565357008)'
-Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140162565357072)'
-Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140162562409616)'
-Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140162562408912)'
-Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140162562409680)'
-Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140162562408528)'
-Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140162562409744)'
-Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140162562409808)'
+Creating shadow state: 'p4_parse_state.start' -> 'shadow_state (start, 140137368047184)'
+Creating shadow state: 'p4_parse_state.parse_pkt_in' -> 'shadow_state (parse_pkt_in, 140137373098640)'
+Creating shadow state: 'p4_parse_state.parse_ethernet' -> 'shadow_state (parse_ethernet, 140137373099280)'
+Creating shadow state: 'p4_parse_state.parse_ipv4' -> 'shadow_state (parse_ipv4, 140137373098448)'
+Creating shadow state: 'p4_parse_state.parse_tcp' -> 'shadow_state (parse_tcp, 140137373099344)'
+Creating shadow state: 'p4_parse_state.parse_udp' -> 'shadow_state (parse_udp, 140137373098064)'
+Creating shadow state: 'p4_parse_state.default_parser' -> 'shadow_state (default_parser, 140137373099408)'
+Creating shadow state: 'p4_parse_state.parse_pkt_out' -> 'shadow_state (parse_pkt_out, 140137373099472)'
 ># End unroll of HLIR parse graph
 ># Begin deparser init
 >## Create records for gress 0
@@ -91,13 +91,13 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [0, 0, 0, 0, 67, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
+POV 32 -> packet_in_hdr
+POV 33 -> packet_out_hdr
 POV 34 -> ethernet
 POV 35 -> ipv4
 POV 36 -> tcp
-POV 37 -> udp
 POV 38 -> pov_bmeta
-POV 32 -> packet_in_hdr
-POV 33 -> packet_out_hdr
+POV 37 -> udp
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
@@ -118,12 +118,12 @@
 ># Begin scraping deparser POV allocation from raw PHV allocation
 PHV layout: [81, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
 >## Scraping individual POV records
+POV 0 -> packet_in_hdr
+POV 1 -> packet_out_hdr
 POV 2 -> ethernet
 POV 3 -> ipv4
 POV 4 -> tcp
 POV 5 -> udp
-POV 0 -> packet_in_hdr
-POV 1 -> packet_out_hdr
 >## Setting up array bits
 ># End scraping deparser POV allocation from raw PHV allocation
 ># Begin parser POV rewrite
@@ -237,9 +237,9 @@
 outputs[addr, width]: ([67, 8], [288, 8], [320, 16], [321, 16], [256, 32], [1, 32], [64, 8], [131, 16], [2, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
@@ -290,9 +290,9 @@
 branch on = None, offset = 0b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch on = None, offset = 64b, dst = <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
 branch promise on = ingress_port, offset = 7b, dst = default_parser
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 8]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state start val 0 mask [False]
 parent state <Shim start state>
 
@@ -451,9 +451,9 @@
 outputs[addr, width]: ([81, 8], [296, 8], [297, 8], [332, 16], [333, 16], [334, 16], [264, 32], [265, 32], [266, 32])
 branch on = fragOffset, offset = 51b, dst = parse_ipv4
 branch on = protocol, offset = 72b, dst = parse_ipv4
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16)]
-match key = [0, 1, 2, 3, 4, 5, 6, 7]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8)]
 match key = [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, None, None, None]
+match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_tcp val 6 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 next state parse_udp val 17 mask [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
 parent state parse_ethernet
@@ -503,9 +503,9 @@
 branch on = None, offset = 24b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch on = None, offset = 168b, dst = <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
 branch promise on = ingress_port, offset = 63b, dst = default_parser
-match_extractions: [match_window(hw_id=2, width=8), match_window(hw_id=0, width=16), match_window(hw_id=3, width=8)]
-match key = [8, 9, 10, 11, 12, 13, 14, 15]
+match_extractions: [match_window(hw_id=0, width=16), match_window(hw_id=2, width=8), match_window(hw_id=3, width=8)]
 match key = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]
+match key = [8, 9, 10, 11, 12, 13, 14, 15]
 match key = [0, 1, 2, 3, 4, 5, 6, 7]
 next state parse_pkt_in val 0 mask [True, True, True, True, True, True, True, True]
 next state default_parser val 0 mask [False]
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
index 71507d1..7e22359 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/parser.characterize.log
@@ -1,6 +1,6 @@
 +---------------------------------------------------------------------+
 |  Log file: parser.characterize.log                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
index 1f4cd19..5cd34c4 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/logs/transform.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: transform.log                                            |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Fri Sep  8 08:26:04 2017                               |
+|  Created on: Tue Sep 12 11:16:41 2017                               |
 +---------------------------------------------------------------------+
 
 -------------------------------
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
index c2c862d..a1252ec 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/name_lookup.c
@@ -157,7 +157,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -458,7 +458,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -759,7 +759,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -1060,7 +1060,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -1361,7 +1361,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -1662,7 +1662,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -1963,7 +1963,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -2264,7 +2264,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -2565,7 +2565,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -2866,7 +2866,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -3167,7 +3167,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
@@ -3468,7 +3468,7 @@
         break;
         case 134 :
         {
-          return "I [ecmp_metadata.groupId]";
+          return "I [ecmp_metadata.group_id]";
         }
         break;
         case 135 :
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
index 9f5f96b..dcd8955 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
@@ -569,7 +569,7 @@
 </div></div><br><br>
 </td></tr>
 </table>
-<br><i>Created on Fri Sep  8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
index 5d4d87a..8f091ce 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
@@ -3495,11 +3495,11 @@
 </title></rect>
 <rect x="16" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:chartreuse""><title>Crossbar Byte 2 in exact Group 0 (parity group 0)
 contains:
-  {ecmp_metadata.groupId[7:0]} for table ecmp_group_table
+  {ecmp_metadata.group_id[7:0]} for table ecmp_group_table
 </title></rect>
 <rect x="16" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:chartreuse""><title>Crossbar Byte 3 in exact Group 0 (parity group 0)
 contains:
-  {ecmp_metadata.groupId[15:8]} for table ecmp_group_table
+  {ecmp_metadata.group_id[15:8]} for table ecmp_group_table
 </title></rect>
 <rect x="24" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 4 in exact Group 0 (parity group 0)</title></rect>
 <rect x="24" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 5 in exact Group 0 (parity group 0)</title></rect>
@@ -32224,7 +32224,7 @@
 </svg><br>
 
 
-<br><i>Created on Fri Sep  8 08:26:21 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </div>
 </body>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
index 17ab0ca..a344e7b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
@@ -6639,7 +6639,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
index 2fd6341..ebd9d26 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
@@ -7420,7 +7420,7 @@
 <br></td></tr>
 
 </table>
-<br><i>Created on Fri Sep  8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
 
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
index 61154ef..c257013 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
@@ -1197,18 +1197,18 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.groupId written by table table0's action ecmp_group
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
 </title></rect>
 <text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.groupId written by table table0's action ecmp_group
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
 </title></text>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
   Assigned to Ingress
@@ -3820,18 +3820,18 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.groupId read by table ecmp_group_table for a match key
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
 </title></rect>
 <text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
   Assigned to Ingress
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
-Field ecmp_metadata.groupId read by table ecmp_group_table for a match key
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
 </title></text>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
   Assigned to Ingress
@@ -6459,7 +6459,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -9052,7 +9052,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -11645,7 +11645,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -14238,7 +14238,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -16831,7 +16831,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -19424,7 +19424,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -22017,7 +22017,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -24610,7 +24610,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -27203,7 +27203,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -29796,7 +29796,7 @@
   Container Bit Width: 16
   Container Address: 134
 
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
 
 </title></rect>
 <rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -31405,7 +31405,7 @@
 <text x="1010" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
 <rect x="0" y="0" width="1053" height="198" style="stroke:black; stroke-width:2; fill:none""></rect>
 </svg><br>
-<br><i>Created on Fri Sep  8 08:26:22 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </body>
 </html>
\ No newline at end of file
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
index 9ea46b3..003fc71 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
@@ -1501,7 +1501,7 @@
 <td align="center">0</td>
 </tr>
 </table>
-<br><i>Created on Fri Sep  8 08:26:21 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
 <br><i>Compiler version: 5.1.0 (fca32d1)</i>
 </body>
 </html>
\ No newline at end of file