diff --git a/core/api/src/main/java/org/onosproject/net/edge/EdgePortEvent.java b/core/api/src/main/java/org/onosproject/net/edge/EdgePortEvent.java
index 3fe4403..85e6a1b 100644
--- a/core/api/src/main/java/org/onosproject/net/edge/EdgePortEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/edge/EdgePortEvent.java
@@ -41,7 +41,7 @@
      * @param type    event type
      * @param subject connection point subject
      */
-    protected EdgePortEvent(Type type, ConnectPoint subject) {
+    public EdgePortEvent(Type type, ConnectPoint subject) {
         super(type, subject);
     }
 
@@ -52,7 +52,7 @@
      * @param subject connection point subject
      * @param time    occurrence time
      */
-    protected EdgePortEvent(Type type, ConnectPoint subject, long time) {
+    public EdgePortEvent(Type type, ConnectPoint subject, long time) {
         super(type, subject, time);
     }
 
diff --git a/core/api/src/main/java/org/onosproject/net/edge/EdgePortService.java b/core/api/src/main/java/org/onosproject/net/edge/EdgePortService.java
index 94ab611..25f18a9 100644
--- a/core/api/src/main/java/org/onosproject/net/edge/EdgePortService.java
+++ b/core/api/src/main/java/org/onosproject/net/edge/EdgePortService.java
@@ -40,7 +40,7 @@
      *
      * @return iterable collection of all edge points
      */
-    Iterable<ConnectPoint> getEdgePoint();
+    Iterable<ConnectPoint> getEdgePoints();
 
     /**
      * Returns a collection of all edge point for the specified device.
@@ -48,7 +48,7 @@
      * @param deviceId device identifier
      * @return iterable collection of all edge points for the device
      */
-    Iterable<ConnectPoint> getEdgePoint(DeviceId deviceId);
+    Iterable<ConnectPoint> getEdgePoints(DeviceId deviceId);
 
     /**
      * Emits the specified packet, with optional treatment to all edge ports.