diff --git a/libraries/classes/Controllers/Server/ServerEnginesController.php b/libraries/classes/Controllers/Server/ServerEnginesController.php
index 30ec044cb9..60d98ddf12 100644
--- a/libraries/classes/Controllers/Server/ServerEnginesController.php
+++ b/libraries/classes/Controllers/Server/ServerEnginesController.php
@@ -43,6 +43,7 @@ class ServerEnginesController extends Controller
                 'type' => 'engines',
             ])
         );
+        $html = '';
 
         /**
          * Did the user request information about a certain storage engine?
@@ -50,50 +51,29 @@ class ServerEnginesController extends Controller
         if (empty($_REQUEST['engine'])
             || ! StorageEngine::isValid($_REQUEST['engine'])
         ) {
-            $this->response->addHTML($this->_getHtmlForAllServerEngines());
+            $html = $this->template->render('server/engines/list_engines', [
+                'engines' => StorageEngine::getStorageEngines(),
+            ]);
         } else {
             $engine = StorageEngine::getEngine($_REQUEST['engine']);
-            $this->response->addHTML($this->_getHtmlForServerEngine($engine));
+            $page = isset($_REQUEST['page']) ? $_REQUEST['page'] : '';
+            $pageOutput = ! empty($page) ? $engine->getPage($page) : '';
+
+            /**
+             * Displays details about a given Storage Engine
+             */
+            $html = $this->template->render('server/engines/show_engine', [
+                'title' => $engine->getTitle(),
+                'help_page' => $engine->getMysqlHelpPage(),
+                'comment' => $engine->getComment(),
+                'info_pages' => $engine->getInfoPages(),
+                'support' => $engine->getSupportInformationMessage(),
+                'variables' => $engine->getHtmlVariables(),
+                'page_output' => $pageOutput,
+                'page' => $page,
+                'engine' => $_REQUEST['engine'],
+            ]);
         }
-    }
-
-    /**
-     * Return HTML with all Storage Engine information
-     *
-     * @return string
-     */
-    private function _getHtmlForAllServerEngines()
-    {
-        return $this->template->render('server/engines/engines', [
-            'engines' => StorageEngine::getStorageEngines(),
-        ]);
-    }
-
-    /**
-     * Return HTML for a given Storage Engine
-     *
-     * @param StorageEngine $engine storage engine
-     *
-     * @return string
-     */
-    private function _getHtmlForServerEngine(StorageEngine $engine)
-    {
-        $page = isset($_REQUEST['page']) ? $_REQUEST['page'] : '';
-        $pageOutput = ! empty($page) ? $engine->getPage($page) : '';
-
-        /**
-         * Displays details about a given Storage Engine
-         */
-        return $this->template->render('server/engines/engine', [
-            'title' => $engine->getTitle(),
-            'help_page' => $engine->getMysqlHelpPage(),
-            'comment' => $engine->getComment(),
-            'info_pages' => $engine->getInfoPages(),
-            'support' => $engine->getSupportInformationMessage(),
-            'variables' => $engine->getHtmlVariables(),
-            'page_output' => $pageOutput,
-            'page' => $page,
-            'engine' => $_REQUEST['engine'],
-        ]);
+        $this->response->addHTML($html);
     }
 }
diff --git a/templates/server/engines/engines.twig b/templates/server/engines/list_engines.twig
similarity index 100%
rename from templates/server/engines/engines.twig
rename to templates/server/engines/list_engines.twig
diff --git a/templates/server/engines/engine.twig b/templates/server/engines/show_engine.twig
similarity index 100%
rename from templates/server/engines/engine.twig
rename to templates/server/engines/show_engine.twig