diff --git a/tools/build/conf/pom.xml b/tools/build/conf/pom.xml
index 4865705..bab81ca 100644
--- a/tools/build/conf/pom.xml
+++ b/tools/build/conf/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onlab.tools</groupId>
+  <groupId>org.onosproject</groupId>
   <artifactId>onos-build-conf</artifactId>
   <version>1.0</version>
 
diff --git a/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml b/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
index eb5a385..2ebfa1d 100644
--- a/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
+++ b/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
@@ -18,13 +18,13 @@
     <!-- False positives on calls to CompletableFuture methods with a null
          parameter -->
     <Match>
-        <Class name="~org\.onlab\.onos\.store\.service\.impl\..*" />
+        <Class name="~org\.onosproject\.store\.service\.impl\..*" />
         <Bug pattern="NP_NONNULL_PARAM_VIOLATION" />
     </Match>
 
     <!-- Filter out testing application -->
     <Match>
-        <Class name="~org\.onlab\.onos\.foo\..*" />
+        <Class name="~org\.onosproject\.foo\..*" />
     </Match>
 
 </FindBugsFilter>
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 9368cb4..9bc8fd5 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -47,15 +47,15 @@
     $ONOS_ROOT/tools/package/bin/onos > bin/onos
 
 # Stage the ONOS bundles
-mkdir -p $KARAF_DIST/system/org/onlab 
-cp -r $M2_REPO/org/onlab $KARAF_DIST/system/org/
+mkdir -p $KARAF_DIST/system/org/onosproject
+cp -r $M2_REPO/org/onosproject $KARAF_DIST/system/org/
 
 export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo}"
 
 # ONOS Patching ----------------------------------------------------------------
 
 # Patch the Apache Karaf distribution file to add ONOS features repository
-perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onlab.onos/onos-features/$ONOS_POM_VERSION/xml/features|" \
+perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onosproject/onos-features/$ONOS_POM_VERSION/xml/features|" \
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 
 
 # Patch the Apache Karaf distribution file to load ONOS features
@@ -63,7 +63,7 @@
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
 
 # Patch the Apache Karaf distribution with ONOS branding bundle
-cp $M2_REPO/org/onlab/onos/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
+cp $M2_REPO/org/onosproject/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
     $ONOS_STAGE/$KARAF_DIST/lib
 
 # Patch in the ONOS version file
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 108ae29..900a416 100644
--- a/tools/package/archetypes/bundle/pom.xml
+++ b/tools/package/archetypes/bundle/pom.xml
@@ -18,7 +18,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onlab.onos</groupId>
+    <groupId>org.onosproject</groupId>
     <artifactId>onos-bundle</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
@@ -32,13 +32,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
             <version>${onos.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-osgi</artifactId>
             <version>${onos.version}</version>
         </dependency>
@@ -58,7 +58,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
             <version>${onos.version}</version>
             <scope>test</scope>
@@ -97,4 +97,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/tools/package/archetypes/bundle/src/test/java/sample/bundle/AppComponentTest.java b/tools/package/archetypes/bundle/src/test/java/sample/bundle/AppComponentTest.java
index 8b1a655..d18ba0d 100644
--- a/tools/package/archetypes/bundle/src/test/java/sample/bundle/AppComponentTest.java
+++ b/tools/package/archetypes/bundle/src/test/java/sample/bundle/AppComponentTest.java
@@ -43,4 +43,4 @@
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 9f1007a..6e169d1 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onlab.onos</groupId>
+        <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
diff --git a/tools/package/archetypes/web-bundle/pom.save.xml b/tools/package/archetypes/web-bundle/pom.save.xml
index 9620742..43e33fb 100644
--- a/tools/package/archetypes/web-bundle/pom.save.xml
+++ b/tools/package/archetypes/web-bundle/pom.save.xml
@@ -18,7 +18,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onlab.onos</groupId>
+    <groupId>org.onosproject</groupId>
     <artifactId>onos-web-bundle</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
@@ -37,24 +37,24 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
             <version>${onos.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-osgi</artifactId>
             <version>${onos.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-rest</artifactId>
             <version>${onos.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onlab.onos</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-junit</artifactId>
             <version>${onos.version}</version>
             <scope>test</scope>
@@ -140,7 +140,7 @@
                             org.onlab.osgi.*,
                             org.onlab.packet.*,
                             org.onlab.rest.*,
-                            org.onlab.onos.*
+                            org.onosproject.*
                         </Import-Package>
                         <Web-ContextPath>${web.context}</Web-ContextPath>
                     </instructions>
@@ -149,4 +149,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/tools/package/archetypes/web-bundle/src/test/java/sample/bundle/AppComponentTest.java b/tools/package/archetypes/web-bundle/src/test/java/sample/bundle/AppComponentTest.java
index 8b1a655..d18ba0d 100644
--- a/tools/package/archetypes/web-bundle/src/test/java/sample/bundle/AppComponentTest.java
+++ b/tools/package/archetypes/web-bundle/src/test/java/sample/bundle/AppComponentTest.java
@@ -43,4 +43,4 @@
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index 5b0b583..8795ba7 100644
--- a/tools/package/branding/pom.xml
+++ b/tools/package/branding/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onlab.onos</groupId>
+        <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index c13b8b9..7c7d3fe 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -44,8 +44,8 @@
     echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
 
     # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it.
-    rm -fr ~/.m2/repository/org/onlab
-    cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab
+    rm -fr ~/.m2/repository/org/onosproject
+    cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onosproject ~/.m2/repository/org/onosproject
 
     # Drop log level for the console
     echo "log4j.logger.org.apache.sshd = WARN" \
diff --git a/tools/test/bin/onos-oecfg b/tools/test/bin/onos-oecfg
index e97449f..e709ce3 100755
--- a/tools/test/bin/onos-oecfg
+++ b/tools/test/bin/onos-oecfg
@@ -7,6 +7,6 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 APP=onos-app-oecfg
-JAR=$M2_REPO/org/onlab/onos/$APP/$ONOS_POM_VERSION/$APP-$ONOS_POM_VERSION.jar
+JAR=$M2_REPO/org/onosproject/$APP/$ONOS_POM_VERSION/$APP-$ONOS_POM_VERSION.jar
 
 java -jar $JAR < $1 | python -mjson.tool
diff --git a/tools/test/bin/onos-push-update-bundle b/tools/test/bin/onos-push-update-bundle
index f8d682a..85fa27b 100755
--- a/tools/test/bin/onos-push-update-bundle
+++ b/tools/test/bin/onos-push-update-bundle
@@ -7,7 +7,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 cd ~/.m2/repository
-jar=$(find org/onlab -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
+jar=$(find org/onosproject -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
 
 [ -z "$jar" ] && echo "No bundle $1 found for" && exit 1
 
diff --git a/tools/test/bin/onos-update-bundle b/tools/test/bin/onos-update-bundle
index 6f6422a..9e9e08b 100755
--- a/tools/test/bin/onos-update-bundle
+++ b/tools/test/bin/onos-update-bundle
@@ -7,7 +7,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 cd ~/.m2/repository
-jar=$(find org/onlab -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
+jar=$(find org/onosproject -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
 
 [ -z "$jar" ] && echo "No bundle $1 found for" && exit 1
 
diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index 6dca835..d385112 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -62,7 +62,7 @@
    
     def start( self ):
         if self.inNamespace:
-            instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features '
+            instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.0.0-SNAPSHOT/xml/features '
                              '-s 8101' )
             if self.ip is not None:
                 instanceOpts += (' -a %s' % self.IP() )