diff --git a/code/CMSMenu.php b/code/CMSMenu.php
index 50a8882f3..847efc035 100644
--- a/code/CMSMenu.php
+++ b/code/CMSMenu.php
@@ -379,7 +379,7 @@ public static function get_cms_classes($root = null, $recursive = true, $sort =
         if (!$root) {
             $root = LeftAndMain::class;
         }
-        $abstractClasses = [LeftAndMain::class, CMSMain::class];
+        $abstractClasses = [LeftAndMain::class];
         $subClasses = array_values(ClassInfo::subclassesFor($root) ?? []);
         foreach ($subClasses as $className) {
             if ($recursive && $className != $root) {
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index ef79a9f12..79af0e50b 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -2011,7 +2011,7 @@ public function providePermissions()
         $perms = [
             "CMS_ACCESS_LeftAndMain" => [
                 'name' => _t(__CLASS__ . '.ACCESSALLINTERFACES', 'Access to all CMS sections'),
-                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
+                'category' => _t(__CLASS__ . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
                 'help' => _t(__CLASS__ . '.ACCESSALLINTERFACESHELP', 'Overrules more specific access settings.'),
                 'sort' => -100
             ]
@@ -2043,11 +2043,11 @@ public function providePermissions()
             $perms[$code] = [
                 // Item in permission selection identifying the admin section. Example: Access to 'Files & Images'
                 'name' => _t(
-                    CMSMain::class . '.ACCESS',
+                    __CLASS__ . '.ACCESS',
                     "Access to '{title}' section",
                     ['title' => $title]
                 ),
-                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access')
+                'category' => _t(__CLASS__ . '.CMS_ACCESS_CATEGORY', 'CMS Access')
             ];
         }
 
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index b817ae5c8..e564c5053 100755
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -141,11 +141,11 @@ public function providePermissions()
         return [
             "CMS_ACCESS_SecurityAdmin" => [
                 'name' => _t(
-                    CMSMain::class . '.ACCESS',
+                    LeftAndMain::class . '.ACCESS',
                     "Access to '{title}' section",
                     ['title' => $title]
                 ),
-                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
+                'category' => _t(LeftAndMain::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
                 'help' => _t(
                     __CLASS__ . '.ACCESS_HELP',
                     'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'