diff --git a/mod/assign/classes/event/all_submissions_downloaded.php b/mod/assign/classes/event/all_submissions_downloaded.php
index 107f2d6fdc6..6fa46d40634 100644
--- a/mod/assign/classes/event/all_submissions_downloaded.php
+++ b/mod/assign/classes/event/all_submissions_downloaded.php
@@ -56,7 +56,7 @@ class all_submissions_downloaded extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/assessable_submitted.php b/mod/assign/classes/event/assessable_submitted.php
index 922fe6ff8e6..7c67ad9373b 100644
--- a/mod/assign/classes/event/assessable_submitted.php
+++ b/mod/assign/classes/event/assessable_submitted.php
@@ -81,7 +81,7 @@ class assessable_submitted extends \core\event\assessable_submitted {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/extension_granted.php b/mod/assign/classes/event/extension_granted.php
index 6bbabdec7d5..5a59f114313 100644
--- a/mod/assign/classes/event/extension_granted.php
+++ b/mod/assign/classes/event/extension_granted.php
@@ -56,7 +56,7 @@ class extension_granted extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/identities_revealed.php b/mod/assign/classes/event/identities_revealed.php
index 84f5d0958f2..ca4a0338bdd 100644
--- a/mod/assign/classes/event/identities_revealed.php
+++ b/mod/assign/classes/event/identities_revealed.php
@@ -56,7 +56,7 @@ class identities_revealed extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/marker_updated.php b/mod/assign/classes/event/marker_updated.php
index b771144a3df..2596e9b7347 100644
--- a/mod/assign/classes/event/marker_updated.php
+++ b/mod/assign/classes/event/marker_updated.php
@@ -56,7 +56,7 @@ class marker_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/statement_accepted.php b/mod/assign/classes/event/statement_accepted.php
index b0e11eb1549..8465c1424ae 100644
--- a/mod/assign/classes/event/statement_accepted.php
+++ b/mod/assign/classes/event/statement_accepted.php
@@ -56,7 +56,7 @@ class statement_accepted extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_duplicated.php b/mod/assign/classes/event/submission_duplicated.php
index 4b7d90fea7b..ebccc0f1aae 100644
--- a/mod/assign/classes/event/submission_duplicated.php
+++ b/mod/assign/classes/event/submission_duplicated.php
@@ -56,7 +56,7 @@ class submission_duplicated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_graded.php b/mod/assign/classes/event/submission_graded.php
index d6d968db77b..bd9e1387a84 100644
--- a/mod/assign/classes/event/submission_graded.php
+++ b/mod/assign/classes/event/submission_graded.php
@@ -56,7 +56,7 @@ class submission_graded extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_locked.php b/mod/assign/classes/event/submission_locked.php
index d1c07cfb598..09e86c0641f 100644
--- a/mod/assign/classes/event/submission_locked.php
+++ b/mod/assign/classes/event/submission_locked.php
@@ -56,7 +56,7 @@ class submission_locked extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_status_updated.php b/mod/assign/classes/event/submission_status_updated.php
index 48fe0ce8bd3..731be58b8ff 100644
--- a/mod/assign/classes/event/submission_status_updated.php
+++ b/mod/assign/classes/event/submission_status_updated.php
@@ -56,7 +56,7 @@ class submission_status_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_unlocked.php b/mod/assign/classes/event/submission_unlocked.php
index cc93f6fd833..fe3feae13f6 100644
--- a/mod/assign/classes/event/submission_unlocked.php
+++ b/mod/assign/classes/event/submission_unlocked.php
@@ -56,7 +56,7 @@ class submission_unlocked extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/submission_updated.php b/mod/assign/classes/event/submission_updated.php
index 00b5653ab1a..1d053c715db 100644
--- a/mod/assign/classes/event/submission_updated.php
+++ b/mod/assign/classes/event/submission_updated.php
@@ -56,7 +56,7 @@ class submission_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assign/classes/event/workflow_state_updated.php b/mod/assign/classes/event/workflow_state_updated.php
index 3f885cb83d8..00c78124750 100644
--- a/mod/assign/classes/event/workflow_state_updated.php
+++ b/mod/assign/classes/event/workflow_state_updated.php
@@ -56,7 +56,7 @@ class workflow_state_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 
diff --git a/mod/assignment/type/online/classes/event/assessable_uploaded.php b/mod/assignment/type/online/classes/event/assessable_uploaded.php
index efbedf8ca9b..d1659b0e4ed 100644
--- a/mod/assignment/type/online/classes/event/assessable_uploaded.php
+++ b/mod/assignment/type/online/classes/event/assessable_uploaded.php
@@ -76,10 +76,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'assignment_online');
+        return get_string('event_assessable_uploaded', 'assignment_online');
     }
 
     /**
diff --git a/mod/assignment/type/upload/classes/event/assessable_submitted.php b/mod/assignment/type/upload/classes/event/assessable_submitted.php
index 2547c8f48db..5a0f2c57752 100644
--- a/mod/assignment/type/upload/classes/event/assessable_submitted.php
+++ b/mod/assignment/type/upload/classes/event/assessable_submitted.php
@@ -81,10 +81,10 @@ class assessable_submitted extends \core\event\assessable_submitted {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_submitted', 'assignment_submitted');
+        return get_string('event_assessable_submitted', 'assignment_submitted');
     }
 
     /**
diff --git a/mod/assignment/type/upload/classes/event/assessable_uploaded.php b/mod/assignment/type/upload/classes/event/assessable_uploaded.php
index de6feccb955..697456b1235 100644
--- a/mod/assignment/type/upload/classes/event/assessable_uploaded.php
+++ b/mod/assignment/type/upload/classes/event/assessable_uploaded.php
@@ -92,10 +92,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'assignment_upload');
+        return get_string('event_assessable_uploaded', 'assignment_upload');
     }
 
     /**
diff --git a/mod/forum/classes/event/assessable_uploaded.php b/mod/forum/classes/event/assessable_uploaded.php
index 0d8b25712e9..db25779a266 100644
--- a/mod/forum/classes/event/assessable_uploaded.php
+++ b/mod/forum/classes/event/assessable_uploaded.php
@@ -76,10 +76,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'mod_forum');
+        return get_string('event_assessable_uploaded', 'mod_forum');
     }
 
     /**
diff --git a/mod/workshop/classes/event/assessable_uploaded.php b/mod/workshop/classes/event/assessable_uploaded.php
index c7907f92d1c..a1c3f53867d 100644
--- a/mod/workshop/classes/event/assessable_uploaded.php
+++ b/mod/workshop/classes/event/assessable_uploaded.php
@@ -91,10 +91,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'mod_workshop');
+        return get_string('event_assessable_uploaded', 'mod_workshop');
     }
 
     /**