diff --git a/admin/tool/dataprivacy/classes/data_request.php b/admin/tool/dataprivacy/classes/data_request.php
index c41db11e839..92c8c1ff243 100644
--- a/admin/tool/dataprivacy/classes/data_request.php
+++ b/admin/tool/dataprivacy/classes/data_request.php
@@ -158,7 +158,7 @@ class data_request extends persistent {
 
         $expiryseconds = get_config('tool_dataprivacy', 'privacyrequestexpiry');
         $expirytime = strtotime("-{$expiryseconds} second");
-        $table = data_request::TABLE;
+        $table = self::TABLE;
         $sqlwhere = 'type = :export_type AND status = :completestatus AND timemodified <= :expirytime';
         $params = array(
             'export_type' => api::DATAREQUEST_TYPE_EXPORT,
@@ -196,7 +196,7 @@ class data_request extends persistent {
             $initialparams = array(api::DATAREQUEST_STATUS_EXPIRED, time());
             $params = array_merge($initialparams, $inparams);
 
-            $update = "UPDATE {" . data_request::TABLE . "}
+            $update = "UPDATE {" . self::TABLE . "}
                           SET status = ?, timemodified = ?
                         WHERE id $insql";
 
diff --git a/admin/tool/dataprivacy/tests/expired_data_requests_test.php b/admin/tool/dataprivacy/tests/expired_data_requests_test.php
index 00c6259cc92..662d9abd51f 100644
--- a/admin/tool/dataprivacy/tests/expired_data_requests_test.php
+++ b/admin/tool/dataprivacy/tests/expired_data_requests_test.php
@@ -115,11 +115,11 @@ class tool_dataprivacy_expired_data_requests_testcase extends data_privacy_testc
     }
 
 
-   /**
-    * Test for \tool_dataprivacy\data_request::is_expired()
-    * Tests for the expected request status to protect from false positive/negative,
-    * then tests is_expired() is returning the expected response.
-    */
+    /**
+     * Test for \tool_dataprivacy\data_request::is_expired()
+     * Tests for the expected request status to protect from false positive/negative,
+     * then tests is_expired() is returning the expected response.
+     */
     public function test_is_expired() {
         $this->resetAfterTest();
         \core_privacy\local\request\writer::setup_real_writer_instance();