diff --git a/admin/tool/monitor/classes/eventlist.php b/admin/tool/monitor/classes/eventlist.php
index 989bc3cafa2..0f5cd1af9ec 100644
--- a/admin/tool/monitor/classes/eventlist.php
+++ b/admin/tool/monitor/classes/eventlist.php
@@ -103,15 +103,16 @@ class eventlist {
             foreach ($pluginlist as $plugin => $directory) {
                 $plugindirectory = $directory . '/classes/event';
                 foreach (self::get_file_list($plugindirectory) as $eventname => $notused) {
-                    $plugineventname = '\\' . $plugintype . '_' . $plugin . '\\event\\' . $eventname;
+                    $fullpluginname = $plugintype . '_' . $plugin;
+                    $plugineventname = '\\' . $fullpluginname . '\\event\\' . $eventname;
                     // Check that this is actually an event.
-                    if (method_exists($plugineventname, 'get_static_info')  && $plugin != 'monitor') { // No selfie here.
+                    if (method_exists($plugineventname, 'get_static_info')  && $fullpluginname !== 'tool_monitor') { // No selfie here.
                         $ref = new \ReflectionClass($plugineventname);
-                        if (!$ref->isAbstract() && $plugin != 'legacy') {
+                        if (!$ref->isAbstract() && $fullpluginname !== 'logstore_legacy') {
                             if ($withoutcomponent) {
                                 $noncorepluginlist[$plugineventname] = $plugineventname::get_name();
                             } else {
-                                $noncorepluginlist[$plugintype . '_' . $plugin][$plugineventname] = $plugineventname::get_name();
+                                $noncorepluginlist[$fullpluginname][$plugineventname] = $plugineventname::get_name();
                             }
                         }
                     }
diff --git a/report/eventlist/classes/list_generator.php b/report/eventlist/classes/list_generator.php
index b7483d61846..ab306888d55 100644
--- a/report/eventlist/classes/list_generator.php
+++ b/report/eventlist/classes/list_generator.php
@@ -197,7 +197,7 @@ class report_eventlist_list_generator {
                     if (method_exists($plugineventname, 'get_static_info')) {
                         if ($detail) {
                             $ref = new \ReflectionClass($plugineventname);
-                            if (!$ref->isAbstract() && $plugin != 'legacy') {
+                            if (!$ref->isAbstract() && $plugintype . '_' . $plugin !== 'logstore_legacy') {
                                 $noncorepluginlist = self::format_data($noncorepluginlist, $plugineventname);
                             }
                         } else {