diff --git a/src/cloudron.js b/src/cloudron.js
index ae50d62cc..7112be34b 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -278,7 +278,7 @@ function prepareDashboardDomain(domain, auditSource, callback) {
             const conflict = result.filter(app => app.fqdn === fqdn);
             if (conflict.length) return callback(new BoxError(BoxError.BAD_STATE, 'Dashboard location conflicts with an existing app'));
 
-            tasks.add(tasks.TASK_PREPARE_DASHBOARD_DOMAIN, [ domain, auditSource ], function (error, taskId) {
+            tasks.add(tasks.TASK_SETUP_DASHBOARD_DNS_AND_CERT, [ domain, auditSource ], function (error, taskId) {
                 if (error) return callback(error);
 
                 tasks.startTask(taskId, {}, NOOP_CALLBACK);
@@ -342,7 +342,7 @@ function setupDashboard(auditSource, progressCallback, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     async.series([
-        domains.prepareDashboardDomain.bind(null, settings.adminDomain(), auditSource, progressCallback),
+        domains.setupDashboardDnsAndCert.bind(null, settings.adminDomain(), auditSource, progressCallback),
         setDashboardDomain.bind(null, settings.adminDomain(), auditSource)
     ], callback);
 }
diff --git a/src/domains.js b/src/domains.js
index ae21523ab..7a2c9c865 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -28,7 +28,7 @@ module.exports = exports = {
 
     checkDnsRecords: checkDnsRecords,
 
-    prepareDashboardDomain: prepareDashboardDomain
+    setupDashboardDnsAndCert: setupDashboardDnsAndCert
 };
 
 var assert = require('assert'),
@@ -454,7 +454,7 @@ function makeWildcard(hostname) {
     return parts.join('.');
 }
 
-function prepareDashboardDomain(domain, auditSource, progressCallback, callback) {
+function setupDashboardDnsAndCert(domain, auditSource, progressCallback, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
diff --git a/src/provision.js b/src/provision.js
index 298cdd3cc..de72b0813 100644
--- a/src/provision.js
+++ b/src/provision.js
@@ -108,7 +108,7 @@ function setup(dnsConfig, sysinfoConfig, auditSource, callback) {
 
                     async.series([
                         settings.setSysinfoConfig.bind(null, sysinfoConfig),
-                        domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
+                        domains.setupDashboardDnsAndCert.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
                         cloudron.setDashboardDomain.bind(null, domain, auditSource),
                         setProgress.bind(null, 'setup', 'Done'),
                         eventlog.add.bind(null, eventlog.ACTION_PROVISION, auditSource, { })
diff --git a/src/tasks.js b/src/tasks.js
index a5bb6dfc2..2d1a21052 100644
--- a/src/tasks.js
+++ b/src/tasks.js
@@ -21,7 +21,7 @@ exports = module.exports = {
     TASK_BACKUP: 'backup',
     TASK_UPDATE: 'update',
     TASK_RENEW_CERTS: 'renewcerts',
-    TASK_PREPARE_DASHBOARD_DOMAIN: 'prepareDashboardDomain',
+    TASK_SETUP_DASHBOARD_DNS_AND_CERT: 'setupDashboardDnsAndCert',
     TASK_CLEAN_BACKUPS: 'cleanBackups',
     TASK_SYNC_EXTERNAL_LDAP: 'syncExternalLdap',
 
diff --git a/src/taskworker.js b/src/taskworker.js
index b02f3b1c7..0ef6a9177 100755
--- a/src/taskworker.js
+++ b/src/taskworker.js
@@ -20,7 +20,7 @@ const TASKS = { // indexed by task type
     backup: backups.backupBoxAndApps,
     update: updater.update,
     renewcerts: reverseProxy.renewCerts,
-    prepareDashboardDomain: domains.prepareDashboardDomain,
+    setupDashboardDnsAndCert: domains.setupDashboardDnsAndCert,
     cleanBackups: backups.cleanup,
     syncExternalLdap: externalLdap.sync,