diff --git a/tools/build/onos-package b/tools/build/onos-package
index 8f6127d..a1264c6 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -30,7 +30,7 @@
 
     # Stage the ONOS admin scripts and patch in Karaf service wrapper extras
     cp -r $ONOS_ROOT/tools/package/bin .
-    cp -r $ONOS_ROOT/tools/package/debian $ONOS_STAGE/debian
+    cp -r $ONOS_ROOT/tools/package/init $ONOS_STAGE/init
     cp -r $ONOS_ROOT/tools/package/etc/* $ONOS_STAGE/$KARAF_DIST/etc
 
     # Stage all builtin ONOS apps for factory install
@@ -111,7 +111,7 @@
     } > $ONOS_DEB_ROOT/DEBIAN/control
 
     cp -r $ONOS_STAGE $ONOS_DEB_ROOT/opt/onos
-    cp $ONOS_ROOT/tools/package/debian/onos.conf $ONOS_DEB_ROOT/etc/init/
+    cp $ONOS_ROOT/tools/package/init/onos.conf $ONOS_DEB_ROOT/etc/init/
 
     mkdir -p $ONOS_DEB_ROOT/opt/onos/var/
 
@@ -136,7 +136,7 @@
             mkdir -p $ONOS_RPM_ROOT/{BUILD,RPMS,SOURCES/ONOS-$ONOS_RPM_VERSION/{etc/init,opt},SPECS,SRPMS}
 
             cp -r $ONOS_STAGE $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/opt/onos
-            cp $ONOS_ROOT/tools/package/debian/onos.conf $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/etc/init/
+            cp $ONOS_ROOT/tools/package/init/onos.conf $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/etc/init/
 
             cd $ONOS_RPM_ROOT/SOURCES
             COPYFILE_DISABLE=1 tar zcf ONOS-$ONOS_RPM_VERSION.tar.gz ONOS-$ONOS_RPM_VERSION
diff --git a/tools/package/debian/onos.conf b/tools/package/init/onos.conf
similarity index 100%
rename from tools/package/debian/onos.conf
rename to tools/package/init/onos.conf
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index 0f4cc9d..7384c2e 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -43,7 +43,7 @@
     mkdir -p -- $ONOS_INSTALL_DIR/$KARAF_DIST/data/raft
 
     # Install the upstart configuration file and setup options for debugging
-    [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf
+    [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/init/onos.conf /etc/init/onos.conf
     echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
 
     # Setup correct user to run onos-service