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 99c6fc1..69da77e 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
@@ -74,7 +74,7 @@
             return;
         }
 
-        for (InterfaceIpAddress interfaceIpAddress: targetInterface.ipAddresses()) {
+        for (InterfaceIpAddress interfaceIpAddress: targetInterface.ipAddressesList()) {
             if (interfaceIpAddress.ipAddress().equals(destIpAddress)) {
                 ipMatches = true;
                 break;
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
index baf6303..95876a8 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
@@ -160,7 +160,7 @@
                     interfaceService.getInterfacesByPort(context.inPacket().receivedFrom());
 
             if (interfaces.stream()
-                    .flatMap(intf -> intf.ipAddresses().stream())
+                    .flatMap(intf -> intf.ipAddressesList().stream())
                     .anyMatch(ia -> ia.ipAddress().equals(dstAddress))) {
                 outputPort = bgpSpeaker.connectPoint();
             }