diff --git a/net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java b/net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
index db688e6..93dca8e 100644
--- a/net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
+++ b/net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
@@ -1,7 +1,7 @@
 package org.onlab.onos.event;
 
 /**
- * Base abstraction of an event.
+ * Base event implementation.
  */
 public class AbstractEvent<T extends Enum, S extends Object> implements Event<T, S> {
 
diff --git a/net/api/src/main/java/org/onlab/onos/event/AbstractListenerManager.java b/net/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
similarity index 86%
rename from net/api/src/main/java/org/onlab/onos/event/AbstractListenerManager.java
rename to net/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
index 0ca3b8e..5e6011a 100644
--- a/net/api/src/main/java/org/onlab/onos/event/AbstractListenerManager.java
+++ b/net/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
@@ -10,10 +10,10 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Base implementation of a manager capable of tracking listeners and
- * dispatching events to them.
+ * Base implementation of an event sink and a registry capable of tracking
+ * listeners and dispatching events to them as part of event sink processing.
  */
-public class AbstractListenerManager<E extends Event, L extends EventListener<E>>
+public class AbstractListenerRegistry<E extends Event, L extends EventListener<E>>
         implements EventSink<E> {
 
     private final Logger log = getLogger(getClass());
diff --git a/net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkBroker.java b/net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
similarity index 88%
rename from net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkBroker.java
rename to net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
index c791544..1c7fb13 100644
--- a/net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkBroker.java
+++ b/net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
@@ -10,12 +10,12 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Base implementation of event sink broker.
+ * Base implementation of event sink registry.
  */
-public class DefaultEventSinkBroker implements EventSinkBroker {
+public class DefaultEventSinkRegistry implements EventSinkRegistry {
 
-    private final Map<Class<? extends Event>, EventSink<? extends Event>> sinks =
-            new ConcurrentHashMap<>();
+    private final Map<Class<? extends Event>, EventSink<? extends Event>>
+            sinks = new ConcurrentHashMap<>();
 
     @Override
     public <E extends Event> void addSink(Class<E> eventClass, EventSink<E> sink) {
diff --git a/net/api/src/main/java/org/onlab/onos/event/Event.java b/net/api/src/main/java/org/onlab/onos/event/Event.java
index 1cd49cd..baefa67 100644
--- a/net/api/src/main/java/org/onlab/onos/event/Event.java
+++ b/net/api/src/main/java/org/onlab/onos/event/Event.java
@@ -1,7 +1,7 @@
 package org.onlab.onos.event;
 
 /**
- * Abstraction of an event.
+ * Abstraction of an of a time-stamped event pertaining to an arbitrary subject.
  */
 public interface Event<T extends Enum, S extends Object> {
 
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java b/net/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
similarity index 67%
rename from net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java
rename to net/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
index 8df68bb..4b7a52d 100644
--- a/net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java
+++ b/net/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
@@ -4,5 +4,5 @@
  * Abstraction of an entity capable of accepting events to be posted and
  * then dispatching them to the appropriate event sink.
  */
-public interface EventDispatchService extends EventDispatcher, EventSinkBroker {
+public interface EventDeliveryService extends EventDispatcher, EventSinkRegistry {
 }
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventSinkBroker.java b/net/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
similarity index 90%
rename from net/api/src/main/java/org/onlab/onos/event/EventSinkBroker.java
rename to net/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
index 7be9562..7398de7 100644
--- a/net/api/src/main/java/org/onlab/onos/event/EventSinkBroker.java
+++ b/net/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
@@ -3,10 +3,10 @@
 import java.util.Set;
 
 /**
- * Abstraction of an event sink broker capable of tracking sinks based on
+ * Abstraction of an event sink registry capable of tracking sinks based on
  * their event class.
  */
-public interface EventSinkBroker {
+public interface EventSinkRegistry {
 
     /**
      * Adds the specified sink for the given event class.
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderBroker.java
deleted file mode 100644
index 90d060a..0000000
--- a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderBroker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.onlab.onos.net.device;
-
-import org.onlab.onos.net.provider.ProviderBroker;
-
-/**
- * Abstraction of a device provider brokerage.
- */
-public interface DeviceProviderBroker
-        extends ProviderBroker<DeviceProvider, DeviceProviderService> {
-}
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java b/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
new file mode 100644
index 0000000..cff252e
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
@@ -0,0 +1,10 @@
+package org.onlab.onos.net.device;
+
+import org.onlab.onos.net.provider.ProviderRegistry;
+
+/**
+ * Abstraction of a device provider registry.
+ */
+public interface DeviceProviderRegistry
+        extends ProviderRegistry<DeviceProvider, DeviceProviderService> {
+}
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderBroker.java
deleted file mode 100644
index e2bfd1c..0000000
--- a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderBroker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.onlab.onos.net.flow;
-
-import org.onlab.onos.net.provider.ProviderBroker;
-
-/**
- * Abstraction for a flow rule provider brokerage.
- */
-public interface FlowRuleProviderBroker
-        extends ProviderBroker<FlowRuleProvider, FlowRuleProviderService> {
-}
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java b/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
new file mode 100644
index 0000000..099d9f4
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
@@ -0,0 +1,10 @@
+package org.onlab.onos.net.flow;
+
+import org.onlab.onos.net.provider.ProviderRegistry;
+
+/**
+ * Abstraction for a flow rule provider registry.
+ */
+public interface FlowRuleProviderRegistry
+        extends ProviderRegistry<FlowRuleProvider, FlowRuleProviderService> {
+}
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/host/HostProviderBroker.java
deleted file mode 100644
index c99d436..0000000
--- a/net/api/src/main/java/org/onlab/onos/net/host/HostProviderBroker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.onlab.onos.net.host;
-
-import org.onlab.onos.net.provider.ProviderBroker;
-
-/**
- * Abstraction of a host provider brokerage.
- */
-public interface HostProviderBroker
-        extends ProviderBroker<HostProvider, HostProviderService> {
-}
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java b/net/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
new file mode 100644
index 0000000..76f281e
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
@@ -0,0 +1,10 @@
+package org.onlab.onos.net.host;
+
+import org.onlab.onos.net.provider.ProviderRegistry;
+
+/**
+ * Abstraction of a host provider registry.
+ */
+public interface HostProviderRegistry
+        extends ProviderRegistry<HostProvider, HostProviderService> {
+}
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderBroker.java
deleted file mode 100644
index fc58f2c..0000000
--- a/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderBroker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.onlab.onos.net.link;
-
-import org.onlab.onos.net.provider.ProviderBroker;
-
-/**
- * Abstraction of an infrastructure link provider brokerage.
- */
-public interface LinkProviderBroker
-        extends ProviderBroker<LinkProvider, LinkProviderService> {
-}
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java b/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
new file mode 100644
index 0000000..2aa54e7
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
@@ -0,0 +1,10 @@
+package org.onlab.onos.net.link;
+
+import org.onlab.onos.net.provider.ProviderRegistry;
+
+/**
+ * Abstraction of an infrastructure link provider registry.
+ */
+public interface LinkProviderRegistry
+        extends ProviderRegistry<LinkProvider, LinkProviderService> {
+}
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
similarity index 87%
rename from net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderBroker.java
rename to net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
index ad1e0ab..6975447 100644
--- a/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderBroker.java
+++ b/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
@@ -7,13 +7,13 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Base implementation of provider broker.
+ * Base implementation of provider registry.
  *
  * @param <P> type of the information provider
  * @param <S> type of the provider service
  */
-public abstract class AbstractProviderBroker<P extends Provider, S extends ProviderService<P>>
-        implements ProviderBroker<P, S> {
+public abstract class AbstractProviderRegistry<P extends Provider, S extends ProviderService<P>>
+        implements ProviderRegistry<P, S> {
 
     private final Map<ProviderId, S> services = new HashMap<>();
 
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/ProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
similarity index 84%
rename from net/api/src/main/java/org/onlab/onos/net/provider/ProviderBroker.java
rename to net/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
index 438fdb7..93436fc 100644
--- a/net/api/src/main/java/org/onlab/onos/net/provider/ProviderBroker.java
+++ b/net/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
@@ -1,12 +1,12 @@
 package org.onlab.onos.net.provider;
 
 /**
- * Broker used for registering/unregistering information providers with the core.
+ * Registry for tracking information providers with the core.
  *
  * @param <P> type of the information provider
  * @param <S> type of the provider service
  */
-public interface ProviderBroker<P extends Provider, S extends ProviderService<P>> {
+public interface ProviderRegistry<P extends Provider, S extends ProviderService<P>> {
 
     /**
      * Registers the supplied provider with the core.
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderBroker.java b/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderBroker.java
deleted file mode 100644
index d3f7e50..0000000
--- a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderBroker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.onlab.onos.net.topology;
-
-import org.onlab.onos.net.provider.ProviderBroker;
-
-/**
- * Abstraction of a network topology provider brokerage.
- */
-public interface TopologyProviderBroker extends
-        ProviderBroker<TopologyProvider, TopologyProviderService> {
-}
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java b/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
new file mode 100644
index 0000000..40bfa66
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
@@ -0,0 +1,10 @@
+package org.onlab.onos.net.topology;
+
+import org.onlab.onos.net.provider.ProviderRegistry;
+
+/**
+ * Abstraction of a network topology provider registry.
+ */
+public interface TopologyProviderRegistry extends
+        ProviderRegistry<TopologyProvider, TopologyProviderService> {
+}