diff --git a/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
index 50db020..48053ef 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
@@ -18,7 +18,7 @@
     protected IMatch match;
     protected PortNumber ingressPort;
     protected Path path;
-    protected List<IAction> edgeActions;
+    protected List<IAction> egressActions;
 
     /**
      * Constructor.
@@ -28,15 +28,15 @@
      * @param ingressPort The ingress port number at the ingress node of the
      *        path.
      * @param path Path between ingress and egress edge node.
-     * @param edgeActions The list of IAction objects at the egress edge node.
+     * @param egressActions The list of IAction objects at the egress edge node.
      */
     public PathFlow(String id,
-            IMatch match, PortNumber ingressPort, Path path, List<IAction> edgeActions) {
+            IMatch match, PortNumber ingressPort, Path path, List<IAction> egressActions) {
         this.id = new FlowId(id);
         this.match = match;
         this.ingressPort = ingressPort;
         this.path = path;
-        this.edgeActions = edgeActions;
+        this.egressActions = egressActions;
     }
 
     @Override
@@ -78,7 +78,7 @@
      *
      * @return The list of IAction objects at the egress edge node.
      */
-    public List<IAction> getActions() {
-        return edgeActions;
+    public List<IAction> getEgressActions() {
+        return egressActions;
     }
 }
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
index e401bdc..538315c 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
@@ -81,7 +81,7 @@
      *
      * @return The set of the pairs of Dpid and OutputAction object.
      */
-    public Set<Pair<Dpid, OutputAction>> getActions() {
+    public Set<Pair<Dpid, OutputAction>> getOutputActions() {
         return outputActions;
     }
 }
