diff --git a/public/course/classes/form/reject_course_request.php b/public/course/classes/form/reject_course_request.php
index 2fd0464d9be..bc027ed6d46 100644
--- a/public/course/classes/form/reject_course_request.php
+++ b/public/course/classes/form/reject_course_request.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_course\form;
+
 use moodleform;
 
 defined('MOODLE_INTERNAL') || die();
@@ -27,7 +29,7 @@ require_once("{$CFG->libdir}/formslib.php");
  * @copyright  Andrew Lyons <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class reject_request_form extends moodleform {
+class reject_course_request extends moodleform {
     function definition() {
         $mform =& $this->_form;
 
diff --git a/public/course/classes/form/request_course.php b/public/course/classes/form/request_course.php
index ce6c8fd770b..18af561507e 100644
--- a/public/course/classes/form/request_course.php
+++ b/public/course/classes/form/request_course.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_course\form;
+
+use core_course\course_request;
+use core_course_category;
 use moodleform;
 
 defined('MOODLE_INTERNAL') || die();
@@ -27,7 +31,8 @@ require_once("{$CFG->libdir}/formslib.php");
  * @copyright  Andrew Lyons <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_request_form extends moodleform {
+class request_course extends moodleform {
+    #[\Override]
     function definition() {
         global $CFG, $DB, $USER;
 
diff --git a/public/course/pending.php b/public/course/pending.php
index 81981ad419d..88c2f2b1094 100644
--- a/public/course/pending.php
+++ b/public/course/pending.php
@@ -30,6 +30,13 @@
  * @package course
  */
 
+use core\context\course as context_course;
+use core\context\system as context_system;
+use core\exception\moodle_exception;
+use core\url;
+use core\output\html_writer;
+use core_course\form\reject_course_request as reject_course_request_form;
+
 require_once(__DIR__ . '/../config.php');
 require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->dirroot . '/course/lib.php');
@@ -76,7 +83,7 @@ if (!empty($reject)) {
     $course = new course_request($reject);
 
     // Prepare the form.
-    $rejectform = new reject_request_form($baseurl);
+    $rejectform = new reject_course_request_form($baseurl);
     $default = new stdClass();
     $default->reject = $course->id;
     $rejectform->set_data($default);
diff --git a/public/course/request.php b/public/course/request.php
index 0c5d8214c4f..5192224c3ff 100644
--- a/public/course/request.php
+++ b/public/course/request.php
@@ -24,6 +24,7 @@
  */
 
 use core_course\course_request;
+use core_course\form\request_course as request_course_form;
 
 require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/course/lib.php');
@@ -67,7 +68,7 @@ require_capability('moodle/course:request', $context);
 // Set up the form.
 $data = $categoryid ? (object)['category' => $categoryid] : null;
 $data = course_request::prepare($data);
-$requestform = new course_request_form($url);
+$requestform = new request_course_form($url);
 $requestform->set_data($data);
 
 $strtitle = get_string('courserequest');