Renaming all Simple*Manager to just *Manager.
diff --git a/core/net/src/test/java/org/onlab/onos/net/host/impl/SimpleHostManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostManagerTest.java
similarity index 97%
rename from core/net/src/test/java/org/onlab/onos/net/host/impl/SimpleHostManagerTest.java
rename to core/net/src/test/java/org/onlab/onos/net/host/impl/HostManagerTest.java
index 2c8c78b..661d2b5 100644
--- a/core/net/src/test/java/org/onlab/onos/net/host/impl/SimpleHostManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostManagerTest.java
@@ -28,7 +28,7 @@
 import org.onlab.onos.net.host.HostProviderService;
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.trivial.host.impl.SimpleHostStore;
+import org.onlab.onos.net.trivial.impl.SimpleHostStore;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
@@ -41,7 +41,7 @@
 /**
  * Test codifying the host service & host provider service contracts.
  */
-public class SimpleHostManagerTest {
+public class HostManagerTest {
 
     private static final ProviderId PID = new ProviderId("of", "foo");
 
@@ -64,7 +64,7 @@
     private static final HostLocation LOC1 = new HostLocation(DID1, P1, 123L);
     private static final HostLocation LOC2 = new HostLocation(DID1, P2, 123L);
 
-    private SimpleHostManager mgr;
+    private HostManager mgr;
 
     protected TestListener listener = new TestListener();
     protected HostProviderRegistry registry;
@@ -73,7 +73,7 @@
 
     @Before
     public void setUp() {
-        mgr = new SimpleHostManager();
+        mgr = new HostManager();
         mgr.store = new SimpleHostStore();
         mgr.eventDispatcher = new TestEventDispatcher();
         registry = mgr;