diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
index 21d5e4f..ec01611 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
@@ -103,7 +103,7 @@
         ICMP icmpReply = new ICMP();
         icmpReply.setPayload(((ICMP) icmpRequestIpv4.getPayload()).getPayload());
         icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
-        icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
+        icmpReply.setIcmpCode(ICMP.CODE_ECHO_REPLY);
         icmpReply.setChecksum((short) 0);
 
         icmpReplyIpv4.setPayload(icmpReply);
diff --git a/utils/misc/src/main/java/org/onlab/packet/ICMP.java b/utils/misc/src/main/java/org/onlab/packet/ICMP.java
index f503667..944f9ee 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ICMP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ICMP.java
@@ -31,7 +31,9 @@
 
     public static final byte TYPE_ECHO_REQUEST = 0x08;
     public static final byte TYPE_ECHO_REPLY = 0x00;
-    //Uses CODE_ECHO_REPLY instead.
+    /**
+     * @deprecated since Peacock (1.15) - Use CODE_ECHO_REPLY instead.
+     */
     @Deprecated
     public static final byte SUBTYPE_ECHO_REPLY = 0x00;
 
@@ -267,7 +269,7 @@
 
         icmpReply.setPayload(icmpRequest.getPayload());
         icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
-        icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
+        icmpReply.setIcmpCode(ICMP.CODE_ECHO_REPLY);
         icmpReply.setChecksum((short) 0);
         ipReply.setPayload(icmpReply);