diff --git a/core/net/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java b/core/net/src/test/java/org/onlab/onos/event/impl/CoreEventDispatcherTest.java
similarity index 96%
rename from core/net/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java
rename to core/net/src/test/java/org/onlab/onos/event/impl/CoreEventDispatcherTest.java
index 88ba165..f13cacf 100644
--- a/core/net/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java
+++ b/core/net/src/test/java/org/onlab/onos/event/impl/CoreEventDispatcherTest.java
@@ -16,9 +16,9 @@
 /**
  * Test of the even dispatcher mechanism.
  */
-public class SimpleEventDispatcherTest {
+public class CoreEventDispatcherTest {
 
-    private final SimpleEventDispatcher dispatcher = new SimpleEventDispatcher();
+    private final CoreEventDispatcher dispatcher = new CoreEventDispatcher();
     private final PrickleSink prickleSink = new PrickleSink();
     private final GooSink gooSink = new GooSink();
 
diff --git a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
index dd52a5e..209bdd0 100644
--- a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
@@ -23,7 +23,7 @@
 import org.onlab.onos.net.provider.AbstractProvider;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.trivial.device.impl.SimpleDeviceStore;
+import org.onlab.onos.net.trivial.impl.SimpleDeviceStore;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
similarity index 97%
rename from core/net/src/test/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManagerTest.java
rename to core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
index 2c0462b..b164015 100644
--- a/core/net/src/test/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
@@ -40,19 +40,19 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.onlab.onos.net.trivial.flow.impl.SimpleFlowRuleStore;
+import org.onlab.onos.net.trivial.impl.SimpleFlowRuleStore;
 
 /**
  * Test codifying the flow rule service & flow rule provider service contracts.
  */
-public class SimpleFlowRuleManagerTest {
+public class FlowRuleManagerTest {
 
     private static final ProviderId PID = new ProviderId("of", "foo");
     private static final DeviceId DID = DeviceId.deviceId("of:001");
     private static final Device DEV = new DefaultDevice(
             PID, DID, Type.SWITCH, "", "", "", "");
 
-    private SimpleFlowRuleManager mgr;
+    private FlowRuleManager mgr;
 
     protected FlowRuleService service;
     protected FlowRuleProviderRegistry registry;
@@ -62,7 +62,7 @@
 
     @Before
     public void setUp() {
-        mgr = new SimpleFlowRuleManager();
+        mgr = new FlowRuleManager();
         mgr.store = new SimpleFlowRuleStore();
         mgr.eventDispatcher = new TestEventDispatcher();
         mgr.deviceService = new TestDeviceService();
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;
diff --git a/core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java
index 0b6f502..b78d954 100644
--- a/core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java
@@ -23,7 +23,7 @@
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.event.impl.TestEventDispatcher;
 import org.onlab.onos.net.device.impl.DeviceManager;
-import org.onlab.onos.net.trivial.link.impl.SimpleLinkStore;
+import org.onlab.onos.net.trivial.impl.SimpleLinkStore;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java
index 77cc809..4731575 100644
--- a/core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java
@@ -27,7 +27,7 @@
 import org.onlab.onos.net.topology.TopologyProviderRegistry;
 import org.onlab.onos.net.topology.TopologyProviderService;
 import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.net.trivial.topology.impl.SimpleTopologyStore;
+import org.onlab.onos.net.trivial.impl.SimpleTopologyStore;
 
 import java.util.ArrayList;
 import java.util.List;