diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
index ef56c33..a5dccdb 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/context.json
@@ -1,5 +1,5 @@
 {
-    "build_date": "Fri Sep  8 08:25:35 2017", 
+    "build_date": "Tue Sep 12 11:16:13 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/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
index 0acaceb..91ad565 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
@@ -1,7 +1,7 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Fri Sep  8 08:25:35 2017", 
+    "BuildDate": "Tue Sep 12 11:16:12 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/mavericks/context/p4_name_lookup.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json
index 36919e7..e16069d 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/p4_name_lookup.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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/mavericks/context/phv.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json
index 2cfaaae..b387dd4 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/phv.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/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,