diff --git a/.upgradenotes/MDL-74583-2024053011024259.yml b/.upgradenotes/MDL-74583-2024053011024259.yml
new file mode 100644
index 00000000000..3b1f1bd7157
--- /dev/null
+++ b/.upgradenotes/MDL-74583-2024053011024259.yml
@@ -0,0 +1,18 @@
+issueNumber: MDL-74583
+notes:
+  core_reportbuilder:
+    - message: >-
+        Support for the following entity classes, renamed since 4.1, has now
+        been removed completely:
+
+
+        - `core_admin\local\entities\task_log`
+
+        - `core_cohort\local\entities\cohort`
+
+        - `core_cohort\local\entities\cohort_member`
+
+        - `core_course\local\entities\course_category`
+
+        - `report_configlog\local\entities\config_change`
+      type: removed
diff --git a/lib/db/renamedclasses.php b/lib/db/renamedclasses.php
index 3a3d1291ba2..bb6da8331ec 100644
--- a/lib/db/renamedclasses.php
+++ b/lib/db/renamedclasses.php
@@ -36,12 +36,6 @@ defined('MOODLE_INTERNAL') || die();
 // The old class name is the key, the new class name is the value.
 // The array must be called $renamedclasses.
 $renamedclasses = [
-    // Since Moodle 4.1.
-    'core_admin\\local\\systemreports\\task_logs' => 'core_admin\\reportbuilder\\local\\systemreports\\task_logs',
-    'core_admin\\local\\entities\\task_log' => 'core_admin\\reportbuilder\\local\\entities\\task_log',
-    'core_course\\local\\entities\\course_category' => 'core_course\\reportbuilder\\local\\entities\\course_category',
-    'core_cohort\\local\\entities\\cohort' => 'core_cohort\\reportbuilder\\local\\entities\\cohort',
-    'core_cohort\\local\\entities\\cohort_member' => 'core_cohort\\reportbuilder\\local\\entities\\cohort_member',
     // Since Moodle 4.2.
     'Box\\Spout' => 'OpenSpout',
     // Since Moodle 4.3.
diff --git a/report/configlog/db/renamedclasses.php b/report/configlog/db/renamedclasses.php
deleted file mode 100644
index cde301e00c0..00000000000
--- a/report/configlog/db/renamedclasses.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file contains mappings for classes that have been renamed so that they meet the requirements of the autoloader.
- *
- * @package    report_configlog
- * @copyright  2022 Paul Holden <paulh@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$renamedclasses = [
-    // Since Moodle 4.1.
-    'report_configlog\\local\\systemreports\\config_changes' =>
-        'report_configlog\\reportbuilder\\local\\systemreports\\config_changes',
-    'report_configlog\\local\\entities\\config_change' =>
-        'report_configlog\\reportbuilder\\local\\entities\\config_change',
-];