diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index af8acf0..9d273d2 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -969,10 +969,10 @@
       "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "FabricIngress.forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
       "id" : 5,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.routing_v4"
     },
     {
       "name" : "FabricIngress.forwarding.acl_counter",
@@ -1747,7 +1747,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 19,
       "runtime_data" : [
         {
@@ -5517,7 +5517,7 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
+              "match_type" : "ternary",
               "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
@@ -5529,7 +5529,7 @@
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "ternary",
           "type" : "simple",
           "max_size" : 1024,
           "with_counters" : true,
@@ -5675,13 +5675,13 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v4",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
             "column" : 10,
-            "source_fragment" : "unicast_v4"
+            "source_fragment" : "routing_v4"
           },
           "key" : [
             {
@@ -5698,10 +5698,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [19, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -6463,7 +6463,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 235,
+            "line" : 186,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -6489,7 +6489,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 236,
+            "line" : 187,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -6515,7 +6515,7 @@
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 250,
+            "line" : 193,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -6533,7 +6533,7 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "true_next" : "FabricIngress.forwarding.routing_v4",
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {