diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostManager.java b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostManager.java
similarity index 99%
rename from core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostManager.java
rename to core/net/src/main/java/org/onlab/onos/net/host/impl/HostManager.java
index bc9312d..1c4cef7 100644
--- a/core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostManager.java
@@ -38,7 +38,7 @@
  */
 @Component(immediate = true)
 @Service
-public class SimpleHostManager
+public class HostManager
         extends AbstractProviderRegistry<HostProvider, HostProviderService>
         implements HostService, HostAdminService, HostProviderRegistry {
 
diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostMonitor.java b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
similarity index 91%
rename from core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostMonitor.java
rename to core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
index 4849466..551dec6 100644
--- a/core/net/src/main/java/org/onlab/onos/net/host/impl/SimpleHostMonitor.java
+++ b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
@@ -17,7 +17,7 @@
 import org.onlab.packet.IpPrefix;
 import org.onlab.util.Timer;
 
-public class SimpleHostMonitor implements TimerTask {
+public class HostMonitor implements TimerTask {
 
     private final HostService hostService;
     private final TopologyService topologyService;
@@ -31,9 +31,9 @@
 
     private Timeout timeout;
 
-    public SimpleHostMonitor(HostService hostService, TopologyService topologyService,
-            DeviceService deviceService,
-            HostProvider hostProvider, PacketProvider packetProvider) {
+    public HostMonitor(HostService hostService, TopologyService topologyService,
+                       DeviceService deviceService,
+                       HostProvider hostProvider, PacketProvider packetProvider) {
         this.hostService = hostService;
         this.topologyService = topologyService;
         this.deviceService = deviceService;