diff --git a/build.properties b/build.properties
index ff0caacbfae..e2a0a266138 100644
--- a/build.properties
+++ b/build.properties
@@ -30,7 +30,7 @@ keystore.validity = 100000
 # The EnsureLockAspect enforces the locking contracts by annotation
 enable.ensurelocking.aspect=false
 
-autodeploy=dashboard,shared,eXide,monex,functx,usermanager
+autodeploy=existdb-dashboard,packageservice,shared,eXide,monex,functx
 autodeploy.repo=http://demo.exist-db.org/exist/apps/public-repo
 use.autodeploy.feature=true
 
diff --git a/installer/apps.properties b/installer/apps.properties
index ca92062176b..ddfebbdaefb 100644
--- a/installer/apps.properties
+++ b/installer/apps.properties
@@ -1,2 +1,2 @@
 apps.repo=http://demo.exist-db.org/exist/apps/public-repo
-apps=shared,dashboard,functx,usermanager,eXide,monex,doc,fundocs,markdown
+apps=shared,existdb-dashboard,packageservice,functx,eXide,monex,exist-documentation,fundocs,markdown
diff --git a/installer/install.xsl b/installer/install.xsl
index d116b820b00..745fe043060 100644
--- a/installer/install.xsl
+++ b/installer/install.xsl
@@ -38,7 +38,7 @@
         <pack name="{$package/@abbrev}" required="no" preselected="yes" parent="Apps">
             <xsl:attribute name="required">
                 <xsl:choose>
-                    <xsl:when test="$package/@abbrev = 'shared' or $package/@abbrev = 'dashboard'">yes</xsl:when>
+                    <xsl:when test="$package/@abbrev = 'shared' or $package/@abbrev = 'existdb-dashboard'">yes</xsl:when>
                     <xsl:otherwise>no</xsl:otherwise>
                 </xsl:choose>
             </xsl:attribute>
diff --git a/src/org/exist/launcher/Launcher.java b/src/org/exist/launcher/Launcher.java
index fc639ba93a2..344ecea8c05 100644
--- a/src/org/exist/launcher/Launcher.java
+++ b/src/org/exist/launcher/Launcher.java
@@ -73,7 +73,7 @@ public class Launcher extends Observable implements Observer {
     private MenuItem showServices;
     private MenuItem quitItem;
 
-    public final static String PACKAGE_DASHBOARD = "http://exist-db.org/apps/dashboard";
+    public final static String PACKAGE_DASHBOARD = "http://exist-db.org/apps/existdb-dashboard";
     public final static String PACKAGE_EXIDE = "http://exist-db.org/apps/eXide";
     public final static String PACKAGE_MONEX = "http://exist-db.org/apps/monex";
 
diff --git a/webapp/controller.xql b/webapp/controller.xql
index b4a36d9c0ec..4f03d7e74ef 100644
--- a/webapp/controller.xql
+++ b/webapp/controller.xql
@@ -14,7 +14,7 @@ import module namespace request="http://exist-db.org/xquery/request";
 import module namespace xdb = "http://exist-db.org/xquery/xmldb";
 
 declare function local:get-dashboard() {
-	let $path := collection(repo:get-root())//expath:package[@name = "http://exist-db.org/apps/dashboard"]
+	let $path := collection(repo:get-root())//expath:package[@name = "http://exist-db.org/apps/existdb-dashboard"]
     return
         if ($path) then
             substring-after(util:collection-name($path), repo:get-root())