diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 5996d830bd4eb7f397e9dc572cfb1d67c6c193d3..4c56c7e8fc4ecabf43c0bb96b0fc3231e7c6913b 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -46,7 +46,7 @@ $config = [
                 'options' => [
                     'route'    => '/bookcover.php',
                     'defaults' => [
-                        'controller' => 'cover',
+                        'controller' => 'Cover',
                         'action'     => 'Show',
                     ]
                 ]
@@ -105,51 +105,51 @@ $config = [
     ],
     'controllers' => [
         'factories' => [
-            'ajax' => 'VuFind\Controller\Factory::getAjaxController',
-            'alphabrowse' => 'VuFind\Controller\Factory::getAlphabrowseController',
-            'author' => 'VuFind\Controller\Factory::getAuthorController',
-            'authority' => 'VuFind\Controller\Factory::getAuthorityController',
-            'browse' => 'VuFind\Controller\Factory::getBrowseController',
-            'browzine' => 'VuFind\Controller\Factory::getBrowZineController',
-            'cart' => 'VuFind\Controller\Factory::getCartController',
-            'channels' => 'VuFind\Controller\Factory::getChannelsController',
-            'collection' => 'VuFind\Controller\Factory::getCollectionController',
-            'collections' => 'VuFind\Controller\Factory::getCollectionsController',
-            'combined' => 'VuFind\Controller\Factory::getCombinedController',
-            'confirm' => 'VuFind\Controller\Factory::getConfirmController',
-            'content' => 'VuFind\Controller\Factory::getContentController',
-            'cover' => 'VuFind\Controller\Factory::getCoverController',
-            'eds' => 'VuFind\Controller\Factory::getEdsController',
-            'edsrecord' => 'VuFind\Controller\Factory::getEdsrecordController',
-            'eit' => 'VuFind\Controller\Factory::getEITController',
-            'eitrecord' => '\VuFind\Controller\Factory::getEITrecordController',
-            'error' => 'VuFind\Controller\Factory::getErrorController',
-            'externalauth' => 'VuFind\Controller\Factory::getExternalAuthController',
-            'feedback' => 'VuFind\Controller\Factory::getFeedbackController',
-            'help' => 'VuFind\Controller\Factory::getHelpController',
-            'hierarchy' => 'VuFind\Controller\Factory::getHierarchyController',
+            'AJAX' => 'VuFind\Controller\Factory::getAjaxController',
+            'Alphabrowse' => 'VuFind\Controller\Factory::getAlphabrowseController',
+            'Author' => 'VuFind\Controller\Factory::getAuthorController',
+            'Authority' => 'VuFind\Controller\Factory::getAuthorityController',
+            'Browse' => 'VuFind\Controller\Factory::getBrowseController',
+            'BrowZine' => 'VuFind\Controller\Factory::getBrowZineController',
+            'Cart' => 'VuFind\Controller\Factory::getCartController',
+            'Channels' => 'VuFind\Controller\Factory::getChannelsController',
+            'Collection' => 'VuFind\Controller\Factory::getCollectionController',
+            'Collections' => 'VuFind\Controller\Factory::getCollectionsController',
+            'Combined' => 'VuFind\Controller\Factory::getCombinedController',
+            'Confirm' => 'VuFind\Controller\Factory::getConfirmController',
+            'Content' => 'VuFind\Controller\Factory::getContentController',
+            'Cover' => 'VuFind\Controller\Factory::getCoverController',
+            'EDS' => 'VuFind\Controller\Factory::getEdsController',
+            'EdsRecord' => 'VuFind\Controller\Factory::getEdsrecordController',
+            'EIT' => 'VuFind\Controller\Factory::getEITController',
+            'EITRecord' => '\VuFind\Controller\Factory::getEITrecordController',
+            'Error' => 'VuFind\Controller\Factory::getErrorController',
+            'ExternalAuth' => 'VuFind\Controller\Factory::getExternalAuthController',
+            'Feedback' => 'VuFind\Controller\Factory::getFeedbackController',
+            'Help' => 'VuFind\Controller\Factory::getHelpController',
+            'Hierarchy' => 'VuFind\Controller\Factory::getHierarchyController',
             'index' => 'VuFind\Controller\Factory::getIndexController',
-            'install' => 'VuFind\Controller\Factory::getInstallController',
-            'libguides' => 'VuFind\Controller\Factory::getLibGuidesController',
-            'librarycards' => 'VuFind\Controller\Factory::getLibraryCardsController',
-            'missingrecord' => 'VuFind\Controller\Factory::getMissingrecordController',
-            'my-research' => 'VuFind\Controller\Factory::getMyResearchController',
-            'oai' => 'VuFind\Controller\Factory::getOaiController',
-            'pazpar2' => 'VuFind\Controller\Factory::getPazpar2Controller',
-            'primo' => 'VuFind\Controller\Factory::getPrimoController',
-            'primorecord' => 'VuFind\Controller\Factory::getPrimorecordController',
-            'qrcode' => 'VuFind\Controller\Factory::getQRCodeController',
-            'record' => 'VuFind\Controller\Factory::getRecordController',
-            'records' => 'VuFind\Controller\Factory::getRecordsController',
-            'search' => 'VuFind\Controller\Factory::getSearchController',
-            'shibbolethlogoutnotification' => 'VuFind\Controller\Factory::getShibbolethLogoutNotificationController',
-            'summon' => 'VuFind\Controller\Factory::getSummonController',
-            'summonrecord' => 'VuFind\Controller\Factory::getSummonrecordController',
-            'tag' => 'VuFind\Controller\Factory::getTagController',
-            'upgrade' => 'VuFind\Controller\Factory::getUpgradeController',
-            'web' => 'VuFind\Controller\Factory::getWebController',
-            'worldcat' => 'VuFind\Controller\Factory::getWorldcatController',
-            'worldcatrecord' => 'VuFind\Controller\Factory::getWorldcatrecordController',
+            'Install' => 'VuFind\Controller\Factory::getInstallController',
+            'LibGuides' => 'VuFind\Controller\Factory::getLibGuidesController',
+            'LibraryCards' => 'VuFind\Controller\Factory::getLibraryCardsController',
+            'MissingRecord' => 'VuFind\Controller\Factory::getMissingrecordController',
+            'MyResearch' => 'VuFind\Controller\Factory::getMyResearchController',
+            'OAI' => 'VuFind\Controller\Factory::getOaiController',
+            'Pazpar2' => 'VuFind\Controller\Factory::getPazpar2Controller',
+            'Primo' => 'VuFind\Controller\Factory::getPrimoController',
+            'PrimoRecord' => 'VuFind\Controller\Factory::getPrimorecordController',
+            'QRCode' => 'VuFind\Controller\Factory::getQRCodeController',
+            'Record' => 'VuFind\Controller\Factory::getRecordController',
+            'Records' => 'VuFind\Controller\Factory::getRecordsController',
+            'Search' => 'VuFind\Controller\Factory::getSearchController',
+            'ShibbolethLogoutNotification' => 'VuFind\Controller\Factory::getShibbolethLogoutNotificationController',
+            'Summon' => 'VuFind\Controller\Factory::getSummonController',
+            'SummonRecord' => 'VuFind\Controller\Factory::getSummonrecordController',
+            'Tag' => 'VuFind\Controller\Factory::getTagController',
+            'Upgrade' => 'VuFind\Controller\Factory::getUpgradeController',
+            'Web' => 'VuFind\Controller\Factory::getWebController',
+            'Worldcat' => 'VuFind\Controller\Factory::getWorldcatController',
+            'WorldcatRecord' => 'VuFind\Controller\Factory::getWorldcatrecordController',
         ],
     ],
     'controller_plugins' => [
diff --git a/module/VuFindAdmin/config/module.config.php b/module/VuFindAdmin/config/module.config.php
index e22e45d90f7331f5dbec73d79f4aeeaabe9b8cb4..6c28c37e5631e57ece40e85508124ad13ffdc248 100644
--- a/module/VuFindAdmin/config/module.config.php
+++ b/module/VuFindAdmin/config/module.config.php
@@ -4,12 +4,12 @@ namespace VuFindAdmin\Module\Configuration;
 $config = [
     'controllers' => [
         'factories' => [
-            'admin' => 'VuFindAdmin\Controller\Factory::getAdminController',
-            'adminconfig' => 'VuFindAdmin\Controller\Factory::getConfigController',
-            'adminsocial' => 'VuFindAdmin\Controller\Factory::getSocialstatsController',
-            'adminmaintenance' => 'VuFindAdmin\Controller\Factory::getMaintenanceController',
-            'adminstatistics' => 'VuFindAdmin\Controller\Factory::getStatisticsController',
-            'admintags' => 'VuFindAdmin\Controller\Factory::getTagsController',
+            'Admin' => 'VuFindAdmin\Controller\Factory::getAdminController',
+            'AdminConfig' => 'VuFindAdmin\Controller\Factory::getConfigController',
+            'AdminSocial' => 'VuFindAdmin\Controller\Factory::getSocialstatsController',
+            'AdminMaintenance' => 'VuFindAdmin\Controller\Factory::getMaintenanceController',
+            'AdminStatistics' => 'VuFindAdmin\Controller\Factory::getStatisticsController',
+            'AdminTags' => 'VuFindAdmin\Controller\Factory::getTagsController',
         ],
     ],
     'router' => [
diff --git a/module/VuFindApi/config/module.config.php b/module/VuFindApi/config/module.config.php
index 8214f56894a0de267144ba4b6866097ee2b2df52..653d8c50c1f20c6aff957e0bdfb83240963b51ef 100644
--- a/module/VuFindApi/config/module.config.php
+++ b/module/VuFindApi/config/module.config.php
@@ -4,8 +4,8 @@ namespace VuFindApi\Module\Configuration;
 $config = [
     'controllers' => [
         'factories' => [
-            'api' => 'VuFindApi\Controller\Factory::getApiController',
-            'searchapi' => 'VuFindApi\Controller\Factory::getSearchApiController',
+            'Api' => 'VuFindApi\Controller\Factory::getApiController',
+            'SearchApi' => 'VuFindApi\Controller\Factory::getSearchApiController',
         ]
     ],
     'router' => [
diff --git a/module/VuFindDevTools/config/module.config.php b/module/VuFindDevTools/config/module.config.php
index dbe3315d235f2adca33c57fbd21bcb13364d1d24..095a9b1a3f0eb222b8e3ce1a4f35d699efef4a6d 100644
--- a/module/VuFindDevTools/config/module.config.php
+++ b/module/VuFindDevTools/config/module.config.php
@@ -4,7 +4,7 @@ namespace VuFindLocalTemplate\Module\Configuration;
 $config = [
     'controllers' => [
         'factories' => [
-            'devtools' => 'VuFindDevTools\Controller\Factory::getDevtoolsController',
+            'DevTools' => 'VuFindDevTools\Controller\Factory::getDevtoolsController',
         ],
     ],
     'router' => [