diff --git a/dashboard/gulpfile.js b/dashboard/gulpfile.js
index 3bc3bd0f1..f1d6b3a9f 100644
--- a/dashboard/gulpfile.js
+++ b/dashboard/gulpfile.js
@@ -122,11 +122,11 @@ gulp.task('js-activation', function () {
         .pipe(gulp.dest('dist/js'));
 });
 
-gulp.task('js-setupdns', function () {
-    return gulp.src(['src/js/setupdns.js', 'src/js/client.js', 'src/js/utils.js'])
+gulp.task('js-setup', function () {
+    return gulp.src(['src/js/setup.js', 'src/js/client.js', 'src/js/utils.js'])
         .pipe(ejs({ apiOrigin: apiOrigin, revision: revision, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
-        .pipe(concat('setupdns.js', { newLine: ';' }))
+        .pipe(concat('setup.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
         .pipe(gulp.dest('dist/js'));
 });
@@ -140,7 +140,7 @@ gulp.task('js-restore', function () {
         .pipe(gulp.dest('dist/js'));
 });
 
-gulp.task('js', gulp.series([ 'js-index', 'js-passwordreset', 'js-setupaccount', 'js-activation', 'js-setupdns', 'js-restore' ]));
+gulp.task('js', gulp.series([ 'js-index', 'js-passwordreset', 'js-setupaccount', 'js-activation', 'js-setup', 'js-restore' ]));
 
 // --------------
 // HTML
@@ -202,7 +202,7 @@ gulp.task('watch', function (done) {
     gulp.watch(['src/views/*.html'], gulp.series(['html-views']));
     gulp.watch(['scripts/createTimezones.js', 'src/js/utils.js'], gulp.series(['timezones']));
     gulp.watch(['src/js/activation.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-activation']));
-    gulp.watch(['src/js/setupdns.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-setupdns']));
+    gulp.watch(['src/js/setup.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-setup']));
     gulp.watch(['src/js/restore.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-restore']));
     gulp.watch(['src/js/passwordreset.js', 'src/js/utils.js'], gulp.series(['js-passwordreset']));
     gulp.watch(['src/js/setupaccount.js', 'src/js/utils.js'], gulp.series(['js-setupaccount']));
diff --git a/dashboard/src/js/activation.js b/dashboard/src/js/activation.js
index 59ba852ae..7463fa6a2 100644
--- a/dashboard/src/js/activation.js
+++ b/dashboard/src/js/activation.js
@@ -85,7 +85,7 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
 
         // if we don't have a domain yet, first go to domain setup
         if (!status.adminFqdn) {
-            window.location.href = '/setupdns.html';
+            window.location.href = '/setup.html';
             return true;
         }
 
diff --git a/dashboard/src/js/index.js b/dashboard/src/js/index.js
index 710b85dc4..6c34375c6 100644
--- a/dashboard/src/js/index.js
+++ b/dashboard/src/js/index.js
@@ -753,7 +753,7 @@ app.controller('MainController', ['$scope', '$route', '$timeout', '$location', '
             } else if (status.adminFqdn) {
                 window.location.href = 'https://' + status.adminFqdn + '/activation.html' + (window.location.search);
             } else {
-                window.location.href = '/setupdns.html' + window.location.search;
+                window.location.href = '/setup.html' + window.location.search;
             }
             return true;
         }
@@ -761,7 +761,7 @@ app.controller('MainController', ['$scope', '$route', '$timeout', '$location', '
         // support local development with localhost check
         if (window.location.hostname !== status.adminFqdn && window.location.hostname !== 'localhost' && !window.location.hostname.startsWith('192.')) {
             // user is accessing by IP or by the old admin location (pre-migration)
-            window.location.href = '/setupdns.html' + window.location.search;
+            window.location.href = '/setup.html' + window.location.search;
             return true;
         }
 
diff --git a/dashboard/src/js/setupdns.js b/dashboard/src/js/setup.js
similarity index 100%
rename from dashboard/src/js/setupdns.js
rename to dashboard/src/js/setup.js
diff --git a/dashboard/src/setupdns.html b/dashboard/src/setup.html
similarity index 99%
rename from dashboard/src/setupdns.html
rename to dashboard/src/setup.html
index 97650a2ba..49dac29df 100644
--- a/dashboard/src/setupdns.html
+++ b/dashboard/src/setup.html
@@ -47,7 +47,7 @@
   <script type="text/javascript" src="/3rdparty/js/showdown-1.9.1.min.js?<%= revision %>"></script>
 
   <!-- Setup Application -->
-  <script type="text/javascript" src="/js/setupdns.js"></script>
+  <script type="text/javascript" src="/js/setup.js"></script>
 
 </head>
 
diff --git a/dashboard/src/views/domains.js b/dashboard/src/views/domains.js
index c0ba9a298..380ea220d 100644
--- a/dashboard/src/views/domains.js
+++ b/dashboard/src/views/domains.js
@@ -41,7 +41,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         { name: 'Custom Wildcard Certificate', value: 'fallback' },
     ];
 
-    // keep in sync with setupdns.js
+    // keep in sync with setup.js
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
         { name: 'Bunny', value: 'bunny' },