diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
index 7f87ce9..6952224 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
@@ -39,7 +39,7 @@
         NICIRA_MATCH_NSH_CH3(4),
         NICIRA_MATCH_NSH_CH4(5),
         OFDPA_MATCH_VLAN_VID(16),
-        P4_BMV2_MATCH_KEY(128);
+        BMV2_MATCH_PARAMS(128);
 
         private ExtensionSelectorType type;
 
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
index 648a397..f87274e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
@@ -46,7 +46,7 @@
         NICIRA_SET_NSH_CH3(36),
         NICIRA_SET_NSH_CH4(37),
         OFDPA_SET_VLAN_ID(64),
-        P4_BMV2_ACTION(128);
+        BMV2_ACTION(128);
 
         private ExtensionTreatmentType type;
 
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index 79461b7..91982d0 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -33,6 +33,7 @@
 import org.onlab.util.Bandwidth;
 import org.onlab.util.ClosedOpenRange;
 import org.onlab.util.Frequency;
+import org.onlab.util.ImmutableByteSequence;
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.Match;
 import org.onosproject.app.ApplicationState;
@@ -535,6 +536,7 @@
             )
             .register(ClosedOpenRange.class)
             .register(DiscreteResourceCodec.class)
+            .register(ImmutableByteSequence.class)
             .build("API");