diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index a10301a..ba1a5d2 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -10,23 +10,32 @@
         ["tmp_1", 32, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t.eth_type", 16, false],
-        ["fabric_metadata_t.ip_eth_type", 16, false],
-        ["fabric_metadata_t.vlan_id", 12, false],
-        ["fabric_metadata_t.vlan_pri", 3, false],
-        ["fabric_metadata_t.vlan_cfi", 1, false],
-        ["fabric_metadata_t.mpls_label", 20, false],
-        ["fabric_metadata_t.mpls_ttl", 8, false],
-        ["fabric_metadata_t.skip_forwarding", 1, false],
-        ["fabric_metadata_t.skip_next", 1, false],
-        ["fabric_metadata_t.fwd_type", 3, false],
-        ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.is_multicast", 1, false],
-        ["fabric_metadata_t.is_controller_packet_out", 1, false],
-        ["fabric_metadata_t.clone_to_cpu", 1, false],
-        ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false]
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._int_meta_source17", 1, false],
+        ["fabric_metadata_t._int_meta_transit18", 1, false],
+        ["fabric_metadata_t._int_meta_sink19", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id20", 32, false],
+        ["fabric_metadata_t._int_meta_new_words21", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes22", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp23", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp24", 32, false],
+        ["_padding_0", 5, false]
       ]
     },
     {
@@ -257,21 +266,6 @@
         ["padding", 2, false],
         ["dscp", 6, false]
       ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 22,
-      "fields" : [
-        ["source", 1, 0],
-        ["transit", 1, 0],
-        ["sink", 1, 0],
-        ["switch_id", 32, false],
-        ["new_words", 8, false],
-        ["new_bytes", 16, false],
-        ["ig_tstamp", 32, false],
-        ["eg_tstamp", 32, false],
-        ["_padding_0", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -435,13 +429,6 @@
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 23,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -528,7 +515,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -541,7 +528,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -686,7 +673,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -699,7 +686,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -759,7 +746,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -772,7 +759,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -844,7 +831,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -857,7 +844,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -893,7 +880,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -906,7 +893,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1441,7 +1428,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
             },
             {
               "type" : "expression",
@@ -1461,8 +1448,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 42,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.source = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1477,7 +1464,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -1497,8 +1484,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -1506,7 +1493,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1526,8 +1513,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1553,7 +1540,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1563,8 +1550,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -1584,7 +1571,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -1594,8 +1581,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -1615,7 +1602,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1625,8 +1612,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1646,7 +1633,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -1656,8 +1643,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -1665,7 +1652,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1675,8 +1662,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1696,7 +1683,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1706,8 +1693,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1733,7 +1720,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1743,8 +1730,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1778,7 +1765,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1798,8 +1785,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1814,7 +1801,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -1834,8 +1821,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1860,7 +1847,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1880,8 +1867,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1907,7 +1894,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1917,8 +1904,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -1969,7 +1956,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1979,8 +1966,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2120,7 +2107,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -2130,8 +2117,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -2227,7 +2214,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -2247,8 +2234,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2297,7 +2284,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -2317,8 +2304,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2333,7 +2320,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -2343,8 +2330,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -2352,7 +2339,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -2362,8 +2349,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -2371,7 +2358,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -2381,8 +2368,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -2390,7 +2377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -2400,8 +2387,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -2416,7 +2403,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -2426,8 +2413,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -2939,14 +2926,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport; ..."
           }
         },
         {
@@ -3088,7 +3075,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
             },
             {
               "type" : "expression",
@@ -3108,8 +3095,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.transit = true"
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -3117,7 +3104,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             },
             {
               "type" : "runtime_data",
@@ -3127,8 +3114,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 31,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.switch_id = switch_id"
+            "column" : 33,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -3215,7 +3202,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3229,7 +3216,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3248,8 +3235,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3257,7 +3244,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3271,7 +3258,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3290,8 +3277,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3340,7 +3327,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3354,7 +3341,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3373,8 +3360,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3382,7 +3369,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3396,7 +3383,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3415,8 +3402,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3531,7 +3518,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3545,7 +3532,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3564,8 +3551,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3573,7 +3560,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3587,7 +3574,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3606,8 +3593,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -3701,7 +3688,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3715,7 +3702,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3734,8 +3721,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3743,7 +3730,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3757,7 +3744,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3776,8 +3763,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3937,7 +3924,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3951,7 +3938,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3970,8 +3957,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3979,7 +3966,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3993,7 +3980,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4012,8 +3999,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4141,7 +4128,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4155,7 +4142,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4174,8 +4161,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4183,7 +4170,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4197,7 +4184,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4216,8 +4203,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4411,7 +4398,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4425,7 +4412,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4444,8 +4431,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -4453,7 +4440,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4467,7 +4454,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4486,8 +4473,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -4521,14 +4508,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4536,7 +4523,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4550,7 +4537,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4569,8 +4556,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -4578,7 +4565,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4592,7 +4579,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4611,8 +4598,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -4712,14 +4699,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4727,7 +4714,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4741,7 +4728,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4760,8 +4747,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4769,7 +4756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4783,7 +4770,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4802,8 +4789,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4871,14 +4858,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4886,7 +4873,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4900,7 +4887,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4919,8 +4906,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4928,7 +4915,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4942,7 +4929,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4961,8 +4948,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5096,14 +5083,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5111,7 +5098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5125,7 +5112,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5144,8 +5131,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5153,7 +5140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5167,7 +5154,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5186,8 +5173,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5300,14 +5287,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5315,7 +5302,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5329,7 +5316,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5348,8 +5335,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5357,7 +5344,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5371,7 +5358,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5390,8 +5377,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5570,14 +5557,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5585,7 +5572,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5599,7 +5586,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5618,8 +5605,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5627,7 +5614,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5641,7 +5628,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5660,8 +5647,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5808,14 +5795,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5823,7 +5810,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5837,7 +5824,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5856,8 +5843,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5865,7 +5852,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5879,7 +5866,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5898,8 +5885,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6112,14 +6099,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6127,7 +6114,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6141,7 +6128,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6160,8 +6147,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -6169,7 +6156,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6183,7 +6170,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6202,8 +6189,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -6258,7 +6245,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6272,7 +6259,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6291,8 +6278,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6300,7 +6287,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6314,7 +6301,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6333,8 +6320,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6402,7 +6389,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6416,7 +6403,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6435,8 +6422,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6444,7 +6431,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6458,7 +6445,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6477,8 +6464,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6580,7 +6567,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6594,7 +6581,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6613,8 +6600,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6622,7 +6609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6636,7 +6623,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6655,8 +6642,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6728,7 +6715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6742,7 +6729,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6761,8 +6748,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6770,7 +6757,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6784,7 +6771,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6803,8 +6790,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6910,7 +6897,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6924,7 +6911,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6943,8 +6930,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6952,7 +6939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6966,7 +6953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6985,8 +6972,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7111,7 +7098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7125,7 +7112,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7144,8 +7131,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7153,7 +7140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7167,7 +7154,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7186,8 +7173,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7346,7 +7333,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7360,7 +7347,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7379,8 +7366,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7388,7 +7375,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7402,7 +7389,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7421,8 +7408,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7471,7 +7458,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7485,7 +7472,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7504,8 +7491,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -7513,7 +7500,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7527,7 +7514,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7546,8 +7533,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -7630,7 +7617,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7644,7 +7631,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7663,8 +7650,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7672,7 +7659,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7686,7 +7673,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7705,8 +7692,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7808,7 +7795,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7822,7 +7809,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7841,8 +7828,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7850,7 +7837,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7864,7 +7851,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7883,8 +7870,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8020,7 +8007,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8034,7 +8021,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8053,8 +8040,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8062,7 +8049,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8076,7 +8063,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8095,8 +8082,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8202,7 +8189,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8216,7 +8203,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8235,8 +8222,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8244,7 +8231,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8258,7 +8245,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8277,8 +8264,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8418,7 +8405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8432,7 +8419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8451,8 +8438,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8460,7 +8447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8474,7 +8461,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8493,8 +8480,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8653,7 +8640,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8667,7 +8654,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8686,8 +8673,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8695,7 +8682,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8709,7 +8696,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8728,8 +8715,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8922,7 +8909,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8936,7 +8923,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8955,8 +8942,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -8964,7 +8951,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8978,7 +8965,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8997,8 +8984,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -9028,18 +9015,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -9073,14 +9060,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -9130,14 +9117,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -9145,7 +9132,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -9190,14 +9177,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -9209,14 +9196,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -9228,14 +9215,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -9247,14 +9234,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -9292,14 +9279,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -9680,7 +9667,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9778,7 +9765,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9827,7 +9814,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       }
                     }
                   },
@@ -10005,7 +9992,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -10041,7 +10028,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -10084,7 +10071,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -10165,19 +10152,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -10201,7 +10188,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -10271,7 +10258,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10309,7 +10296,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10343,7 +10330,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10380,7 +10367,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10512,15 +10499,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -10623,7 +10610,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -10651,7 +10638,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10677,7 +10664,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10703,7 +10690,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10734,7 +10721,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -10940,7 +10927,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -11156,13 +11143,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             }
           ],
@@ -12100,7 +12087,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -12163,7 +12150,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -12184,7 +12171,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -12223,7 +12210,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -12267,7 +12254,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12346,7 +12333,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12555,7 +12542,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
                   }
                 }
               },
@@ -12611,7 +12598,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
                   }
                 }
               },
@@ -12733,6 +12720,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -12757,6 +12746,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -12823,4 +12814,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 6790d59..6c5b97e 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33581620
@@ -15,7 +18,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318787614
@@ -112,7 +116,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -135,7 +140,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -161,7 +167,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -281,7 +288,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -313,7 +321,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -342,7 +351,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -366,7 +376,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -407,7 +418,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318800047
@@ -430,7 +442,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   size: 1
@@ -458,7 +471,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -940,6 +954,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -957,6 +972,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {