diff --git a/modules/setup/application/controllers/SetupController.php b/modules/setup/application/controllers/IndexController.php
similarity index 89%
rename from modules/setup/application/controllers/SetupController.php
rename to modules/setup/application/controllers/IndexController.php
index dbd342d46..113886c88 100644
--- a/modules/setup/application/controllers/SetupController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -2,10 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Module\Setup\WebWizard;
 
-class SetupController extends ActionController
+class Setup_IndexController extends ModuleActionController
 {
     /**
      * Whether the controller requires the user to be authenticated
diff --git a/modules/setup/application/views/scripts/setup/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
similarity index 98%
rename from modules/setup/application/views/scripts/setup/index.phtml
rename to modules/setup/application/views/scripts/index/index.phtml
index 5b900bd3b..7a0cc7adb 100644
--- a/modules/setup/application/views/scripts/setup/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -137,9 +137,9 @@ if ($notifications->hasMessages()) {
   </div>
   <div class="setup-content">
 <?php if ($finished): ?>
-    <?= $this->render('setup/parts/finish.phtml'); ?>
+    <?= $this->render('index/parts/finish.phtml'); ?>
 <?php else: ?>
-    <?= $this->render('setup/parts/wizard.phtml'); ?>
+    <?= $this->render('index/parts/wizard.phtml'); ?>
 <?php endif ?>
   </div>
 </div>
\ No newline at end of file
diff --git a/modules/setup/application/views/scripts/setup/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
similarity index 100%
rename from modules/setup/application/views/scripts/setup/parts/finish.phtml
rename to modules/setup/application/views/scripts/index/parts/finish.phtml
diff --git a/modules/setup/application/views/scripts/setup/parts/wizard.phtml b/modules/setup/application/views/scripts/index/parts/wizard.phtml
similarity index 100%
rename from modules/setup/application/views/scripts/setup/parts/wizard.phtml
rename to modules/setup/application/views/scripts/index/parts/wizard.phtml