diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 1edf587..1c66548 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -28,7 +28,7 @@
     <br>
     <img src="doc-files/onos-subsystem.png" alt="ONOS subsystem structure"><br>
     For example, the device-subsystem comprises of a core
-    {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager},
+    {@link org.onlab.onos.net.trivial.device.impl.DeviceManager},
     which exposes a north-bound
     {@link org.onlab.onos.net.device.DeviceService} through which applications or other core components
     can learn about the global infrastructure device inventory and through
@@ -39,7 +39,7 @@
 </p>
 
 <p>
-    On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager}
+    On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.DeviceManager}
     exposes a {@link org.onlab.onos.net.device.DeviceProviderRegistry} through which any number of
     {@link org.onlab.onos.net.device.DeviceProvider} entities can register and in turn obtain a
     {@link org.onlab.onos.net.device.DeviceProviderService}. Device and port information can then be
@@ -52,7 +52,7 @@
 <p>
     Within the core, the tasks of indexing, persisting and synchronizing the
     global device and port state with the cluster peers falls on the
-    {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceStore DeviceStore}.
+    {@link org.onlab.onos.net.device.DeviceStore}.
 </p>
 
 <p>