diff --git a/docs/external.xml b/docs/external.xml
index 5b73366..320cf5c 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -24,7 +24,7 @@
     </prerequisites>
 
     <parent>
-        <groupId>org.onlab.onos</groupId>
+        <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -49,14 +49,14 @@
                 <version>2.10.1</version>
                 <configuration>
                     <show>package</show>
-                    <excludePackageNames>org.onlab.thirdparty:*.impl:*.impl.*:org.onlab.onos.provider.*:org.onlab.onos.gui:org.onlab.onos.rest:org.onlab.onos.cli*:org.onlab.onos.tvue:org.onlab.onos.foo:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.optical:org.onlab.onos.config:org.onlab.onos.calendar:org.onlab.onos.sdnip*:org.onlab.onos.oecfg:org.onlab.onos.metrics:org.onlab.onos.store.*:org.onlab.onos.openflow.*</excludePackageNames>
+                    <excludePackageNames>org.onlab.thirdparty:*.impl:*.impl.*:org.onosproject.provider.*:org.onosproject.gui:org.onosproject.rest:org.onosproject.cli*:org.onosproject.tvue:org.onosproject.foo:org.onosproject.mobility:org.onosproject.proxyarp:org.onosproject.fwd:org.onosproject.ifwd:org.onosproject.optical:org.onosproject.config:org.onosproject.calendar:org.onosproject.sdnip*:org.onosproject.oecfg:org.onosproject.metrics:org.onosproject.store.*:org.onosproject.openflow.*</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
                     <doctitle>ONOS Java API</doctitle>
                     <groups>
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onlab.onos:org.onlab.onos.*
+                                org.onosproject:org.onosproject.*
                             </packages>
                         </group>
                         <group>
diff --git a/docs/pom.xml b/docs/pom.xml
index 3392e73..f827ceb 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -24,7 +24,7 @@
     </prerequisites>
 
     <parent>
-        <groupId>org.onlab.onos</groupId>
+        <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -55,26 +55,26 @@
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onlab.onos:org.onlab.onos.*
+                                org.onosproject:org.onosproject.*
                             </packages>
                         </group>
                         <group>
                             <title>Core Subsystems</title>
                             <packages>
-                                org.onlab.onos.impl:org.onlab.onos.core.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.net.resource.impl:org.onlab.onos.json:org.onlab.onos.json.*:org.onlab.onos.provider.host.impl:org.onlab.onos.provider.lldp.impl:org.onlab.onos.net.statistic.impl
+                                org.onosproject.impl:org.onosproject.core.impl:org.onosproject.cluster.impl:org.onosproject.net.device.impl:org.onosproject.net.link.impl:org.onosproject.net.host.impl:org.onosproject.net.topology.impl:org.onosproject.net.packet.impl:org.onosproject.net.flow.impl:org.onosproject.net.*.impl:org.onosproject.event.impl:org.onosproject.net.intent.impl:org.onosproject.net.proxyarp.impl:org.onosproject.mastership.impl:org.onosproject.net.resource.impl:org.onosproject.json:org.onosproject.json.*:org.onosproject.provider.host.impl:org.onosproject.provider.lldp.impl:org.onosproject.net.statistic.impl
                             </packages>
                         </group>
                         <group>
                             <title>Distributed Stores</title>
                             <packages>
-                                org.onlab.onos.store.*
+                                org.onosproject.store.*
                             </packages>
                         </group>
                         <group>
                             <title>OpenFlow Providers &amp; Controller
                             </title>
                             <packages>
-                                org.onlab.onos.provider.of.*:org.onlab.onos.openflow.*
+                                org.onosproject.provider.of.*:org.onosproject.openflow.*
                             </packages>
                         </group>
                         <group>
@@ -86,23 +86,23 @@
                         <group>
                             <title>GUI, REST &amp; Command-Line</title>
                             <packages>
-                                org.onlab.onos.gui:org.onlab.onos.rest:org.onlab.onos.cli:org.onlab.onos.gui.*:org.onlab.onos.rest.*:org.onlab.onos.cli.*:org.onlab.onos.codec.impl
+                                org.onosproject.gui:org.onosproject.rest:org.onosproject.cli:org.onosproject.gui.*:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
                             </packages>
                         </group>
                         <group>
                             <title>Sample Applications</title>
                             <packages>
-                                org.onlab.onos.tvue:org.onlab.onos.fwd:org.onlab.onos.ifwd:org.onlab.onos.mobility:org.onlab.onos.proxyarp:org.onlab.onos.foo:org.onlab.onos.calendar:org.onlab.onos.optical:org.onlab.onos.optical.*:org.onlab.onos.sdnip:org.onlab.onos.sdnip.*:org.onlab.onos.config
+                                org.onosproject.tvue:org.onosproject.fwd:org.onosproject.ifwd:org.onosproject.mobility:org.onosproject.proxyarp:org.onosproject.foo:org.onosproject.calendar:org.onosproject.optical:org.onosproject.optical.*:org.onosproject.sdnip:org.onosproject.sdnip.*:org.onosproject.config
                             </packages>
                         </group>
                         <group>
                             <title>Test Instrumentation</title>
                             <packages>
-                                org.onlab.onos.metrics.*
+                                org.onosproject.metrics.*
                             </packages>
                         </group>
                     </groups>
-                    <excludePackageNames>org.onlab.thirdparty:org.onlab.onos.oecfg</excludePackageNames>
+                    <excludePackageNames>org.onlab.thirdparty:org.onosproject.oecfg</excludePackageNames>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/docs/src/main/javadoc/overview.html b/docs/src/main/javadoc/overview.html
index 501a0ef..a3e32d9 100644
--- a/docs/src/main/javadoc/overview.html
+++ b/docs/src/main/javadoc/overview.html
@@ -43,23 +43,23 @@
     <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.device.impl.DeviceManager},
+    {@link org.onosproject.net.device.impl.DeviceManager},
     which exposes a north-bound
-    {@link org.onlab.onos.net.device.DeviceService} through which applications or other core components
+    {@link org.onosproject.net.device.DeviceService} through which applications or other core components
     can learn about the global infrastructure device inventory and through
-    which they can also subscribe for asynchronous {@link org.onlab.onos.net.device.DeviceEvent}
-    notifications via the {@link org.onlab.onos.net.device.DeviceListener} mechanism. A set of
-    administrative actions can be performed via {@link org.onlab.onos.net.device.DeviceAdminService},
+    which they can also subscribe for asynchronous {@link org.onosproject.net.device.DeviceEvent}
+    notifications via the {@link org.onosproject.net.device.DeviceListener} mechanism. A set of
+    administrative actions can be performed via {@link org.onosproject.net.device.DeviceAdminService},
     e.g. setting mastership role, removing a decommissioned device.
 </p>
 
 <p>
-    On the south-bound side, the core {@link org.onlab.onos.net.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
+    On the south-bound side, the core {@link org.onosproject.net.device.impl.DeviceManager}
+    exposes a {@link org.onosproject.net.device.DeviceProviderRegistry} through which any number of
+    {@link org.onosproject.net.device.DeviceProvider} entities can register and in turn obtain a
+    {@link org.onosproject.net.device.DeviceProviderService}. Device and port information can then be
     supplied to the core by each provider through the provider service issued
-    to them. When a provider unregisters, its {@link org.onlab.onos.net.device.DeviceProviderService}
+    to them. When a provider unregisters, its {@link org.onosproject.net.device.DeviceProviderService}
     will be invalidated and can no longer be used for interacting with the
     core.
 </p>
@@ -67,7 +67,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.device.DeviceStore}.
+    {@link org.onosproject.net.device.DeviceStore}.
 </p>
 
 <p>