diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyDatastore.java b/src/main/java/net/onrc/onos/core/topology/TopologyDatastore.java
index 79afc77..815958f 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyDatastore.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyDatastore.java
@@ -174,8 +174,8 @@
      * @param device the device to add.
      * @return true on success, otherwise false.
      */
-    public boolean addDevice(DeviceEvent device) {
-        log.debug("Adding device into DB. mac {}", device.getMac());
+    public boolean addHost(HostEvent device) {
+        log.debug("Adding host into DB. mac {}", device.getMac());
 
         KVDevice rcDevice = new KVDevice(device.getMac().toBytes());
 
@@ -195,8 +195,8 @@
      * @param device the device to remove.
      * @return true on success, otherwise false.
      */
-    public boolean removeDevice(DeviceEvent device) {
-        log.debug("Removing device into DB. mac {}", device.getMac());
+    public boolean removeHost(HostEvent device) {
+        log.debug("Removing host into DB. mac {}", device.getMac());
 
         KVDevice rcDevice = new KVDevice(device.getMac().toBytes());
         rcDevice.forceDelete();