diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
index f0efbe5..9d68d47 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
@@ -6,11 +6,11 @@
       "fields" : [
         ["tmp", 32, false],
         ["tmp_0", 32, false],
-        ["port_meters_ingress_ingress_color_0", 8, false],
-        ["host_meter_control_meter_tag_0", 8, false],
+        ["port_meters_ingress_ingress_color", 8, false],
+        ["host_meter_control_meter_tag", 8, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
-        ["port_meters_egress_egress_color_0", 8, false],
+        ["port_meters_egress_egress_color", 8, false],
         ["local_metadata_t.l4_src_port", 16, false],
         ["local_metadata_t.l4_dst_port", 16, false],
         ["local_metadata_t.next_hop_id", 16, false]
@@ -459,7 +459,7 @@
       "type" : "bytes",
       "size" : 1024,
       "binding" : "ingress.host_meter_control.host_meter_table",
-      "result_target" : ["scalars", "host_meter_control_meter_tag_0"]
+      "result_target" : ["scalars", "host_meter_control_meter_tag"]
     },
     {
       "name" : "egress.port_meters_egress.egress_port_meter",
@@ -864,7 +864,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "port_meters_ingress_ingress_color_0"]
+              "value" : ["scalars", "port_meters_ingress_ingress_color"]
             }
           ],
           "source_info" : {
@@ -927,7 +927,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "host_meter_control_meter_tag_0"]
+              "value" : ["scalars", "host_meter_control_meter_tag"]
             },
             {
               "type" : "hexstr",
@@ -1078,7 +1078,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "port_meters_egress_egress_color_0"]
+              "value" : ["scalars", "port_meters_egress_egress_color"]
             }
           ],
           "source_info" : {
@@ -1470,7 +1470,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "port_meters_ingress_ingress_color_0"]
+                "value" : ["scalars", "port_meters_ingress_ingress_color"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -1522,7 +1522,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "host_meter_control_meter_tag_0"]
+                "value" : ["scalars", "host_meter_control_meter_tag"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -1659,7 +1659,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "port_meters_egress_egress_color_0"]
+                "value" : ["scalars", "port_meters_egress_egress_color"]
               },
               "right" : {
                 "type" : "hexstr",
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info
index 4dc3701..a017ca2 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info
@@ -73,7 +73,6 @@
   const_default_action_id: 16784184
   direct_resource_ids: 318816189
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -95,7 +94,6 @@
   }
   direct_resource_ids: 352337889
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -119,7 +117,6 @@
   implementation_id: 285253634
   direct_resource_ids: 318811794
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 actions {
   preamble {
@@ -239,6 +236,28 @@
   }
   direct_table_id: 33594717
 }
+meters {
+  preamble {
+    id: 335581151
+    name: "ingress.port_meters_ingress.ingress_port_meter"
+    alias: "ingress_port_meter"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 511
+}
+meters {
+  preamble {
+    id: 335569641
+    name: "egress.port_meters_egress.egress_port_meter"
+    alias: "egress_port_meter"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 511
+}
 direct_meters {
   preamble {
     id: 352337889
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info
index 101e2bb..f280ea7 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info
@@ -73,7 +73,6 @@
   const_default_action_id: 16784184
   direct_resource_ids: 318816189
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -142,7 +141,6 @@
   }
   direct_resource_ids: 318829828
   size: 256
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -165,7 +163,6 @@
   }
   direct_resource_ids: 318811186
   size: 256
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -206,7 +203,6 @@
   }
   direct_resource_ids: 318796349
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -223,7 +219,6 @@
   }
   direct_resource_ids: 318803385
   size: 2
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -291,7 +286,6 @@
   }
   direct_resource_ids: 318805102
   size: 16
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -359,7 +353,6 @@
   }
   direct_resource_ids: 318775631
   size: 16
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {