diff --git a/core/net/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java b/core/net/src/main/java/org/onlab/onos/event/impl/CoreEventDispatcher.java
similarity index 97%
rename from core/net/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
rename to core/net/src/main/java/org/onlab/onos/event/impl/CoreEventDispatcher.java
index 3834676..0caef5c 100644
--- a/core/net/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
+++ b/core/net/src/main/java/org/onlab/onos/event/impl/CoreEventDispatcher.java
@@ -24,7 +24,7 @@
  */
 @Component(immediate = true)
 @Service
-public class SimpleEventDispatcher extends DefaultEventSinkRegistry
+public class CoreEventDispatcher extends DefaultEventSinkRegistry
         implements EventDeliveryService {
 
     private final Logger log = getLogger(getClass());
diff --git a/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java b/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java
deleted file mode 100644
index 431ec13..0000000
--- a/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.onlab.onos.net;
-
-/**
- * Created by tom on 9/19/14.
- */
-public class DeleteMe {
-}
diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/package-info.java b/core/net/src/main/java/org/onlab/onos/net/device/impl/package-info.java
new file mode 100644
index 0000000..02afb8c
--- /dev/null
+++ b/core/net/src/main/java/org/onlab/onos/net/device/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking global inventory of infrastructure devices.
+ */
+package org.onlab.onos.net.device.impl;
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
similarity index 99%
rename from core/net/src/main/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManager.java
rename to core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
index 4a1cd3b..41f7303 100644
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/SimpleFlowRuleManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -31,7 +31,7 @@
 
 @Component(immediate = true)
 @Service
-public class SimpleFlowRuleManager
+public class FlowRuleManager
         extends AbstractProviderRegistry<FlowRuleProvider, FlowRuleProviderService>
         implements FlowRuleService, FlowRuleProviderRegistry {
 
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;
diff --git a/core/net/src/main/java/org/onlab/onos/net/link/impl/package-info.java b/core/net/src/main/java/org/onlab/onos/net/link/impl/package-info.java
new file mode 100644
index 0000000..44327b3
--- /dev/null
+++ b/core/net/src/main/java/org/onlab/onos/net/link/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking global inventory of infrastructure links.
+ */
+package org.onlab.onos.net.link.impl;
diff --git a/core/net/src/main/java/org/onlab/onos/net/packet/impl/SimplePacketManager.java b/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
similarity index 98%
rename from core/net/src/main/java/org/onlab/onos/net/packet/impl/SimplePacketManager.java
rename to core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
index ee1b025..e682c49 100644
--- a/core/net/src/main/java/org/onlab/onos/net/packet/impl/SimplePacketManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
@@ -30,7 +30,7 @@
  */
 @Component(immediate = true)
 @Service
-public class SimplePacketManager
+public class PacketManager
 extends AbstractProviderRegistry<PacketProvider, PacketProviderService>
 implements PacketService, PacketProviderRegistry {