Renaming all Simple*Manager to just *Manager.
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();