diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
index 1fc70ec..c14d00c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -421,7 +421,7 @@
 	    startSetProperties = System.nanoTime();
 	}
 
-	FlowProperty flowProp = new FlowProperty(dbHandler, flowEntryObj);
+	FlowEntryProperty flowProp = new FlowEntryProperty(dbHandler, flowEntryObj);
 
 	//
 	// Set the Flow Entry key:
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowProperty.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEntryProperty.java
similarity index 96%
rename from src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowProperty.java
rename to src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEntryProperty.java
index ccc1124..e59ab93 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowProperty.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEntryProperty.java
@@ -6,12 +6,12 @@
 import net.onrc.onos.graph.DBOperation;
 import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IFlowEntry;
 
-public class FlowProperty {
+public class FlowEntryProperty {
     private Map<String, Object> map = new HashMap<>();
     private DBOperation dbhandler;
     private IFlowEntry flowEntry;
     
-    public FlowProperty(DBOperation dbHandler, IFlowEntry flowEntry) {
+    public FlowEntryProperty(DBOperation dbHandler, IFlowEntry flowEntry) {
         this.dbhandler = dbHandler;
         this.flowEntry = flowEntry;
     }