diff --git a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/p4info.txt b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/p4info.txt
index aafb1e5..6de93cf 100644
--- a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/p4info.txt
+++ b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/p4info.txt
@@ -211,13 +211,13 @@
   }
   match_fields {
     id: 5
-    name: "eth_src"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "eth_dst"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
diff --git a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/context.json b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/context.json
index ed112b6..3778c53 100644
--- a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/context.json
+++ b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "Tue Dec 17 02:28:15 2019",
+  "build_date": "Wed Dec 18 02:58:08 2019",
   "schema_version": "1.8.4",
   "compiler_version": "9.0.0",
   "target": "tofino",
@@ -85656,7 +85656,7 @@
                         "field_width": 32
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -85665,7 +85665,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85674,7 +85674,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 9,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85683,7 +85683,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 17,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85692,7 +85692,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 25,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85701,7 +85701,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 33,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85710,7 +85710,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -85737,7 +85737,7 @@
                         "field_width": 16
                       },
                       {
-                        "field_name": "eth_dst",
+                        "field_name": "eth_src",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -85809,7 +85809,7 @@
                         "field_width": 8
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 1,
                         "lsb_mem_word_idx": 0,
                         "msb_mem_word_idx": 0,
@@ -85854,7 +85854,7 @@
                         "field_width": 1
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 41,
                         "lsb_mem_word_idx": 5,
                         "msb_mem_word_idx": 5,
@@ -85863,7 +85863,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 41,
                         "lsb_mem_word_idx": 4,
                         "msb_mem_word_idx": 4,
@@ -85872,7 +85872,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 41,
                         "lsb_mem_word_idx": 3,
                         "msb_mem_word_idx": 3,
@@ -85881,7 +85881,7 @@
                         "field_width": 4
                       },
                       {
-                        "field_name": "eth_src",
+                        "field_name": "eth_dst",
                         "lsb_mem_word_offset": 41,
                         "lsb_mem_word_idx": 2,
                         "msb_mem_word_idx": 2,
@@ -86404,7 +86404,7 @@
           "field_name": "l4_dport"
         },
         {
-          "name": "eth_src",
+          "name": "eth_dst",
           "global_name": "hdr.ethernet.dst_addr",
           "start_bit": 0,
           "bit_width": 48,
@@ -86416,7 +86416,7 @@
           "field_name": "dst_addr"
         },
         {
-          "name": "eth_dst",
+          "name": "eth_src",
           "global_name": "hdr.ethernet.src_addr",
           "start_bit": 0,
           "bit_width": 48,
@@ -122257,6 +122257,6 @@
       ]
     }
   ],
-  "run_id": "61945496d32615f9",
+  "run_id": "5a1ab9e114c2cfed",
   "driver_options": { "hash_parity_enabled": false, "high_availability_enabled": true }
 }
\ No newline at end of file
diff --git a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/tofino.bin b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/tofino.bin
index bb64fea..df65504 100644
--- a/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/tofino.bin
+++ b/src/main/resources/p4c-out/fabric-int/tofino/mavericks_sde_9_0_0/pipe/tofino.bin
Binary files differ