diff --git a/modules/contactowner/helpers/contactowner_menu.php b/modules/contactowner/helpers/contactowner_event.php
similarity index 93%
rename from modules/contactowner/helpers/contactowner_menu.php
rename to modules/contactowner/helpers/contactowner_event.php
index 3a00bf1e..6ebfccd9 100644
--- a/modules/contactowner/helpers/contactowner_menu.php
+++ b/modules/contactowner/helpers/contactowner_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class contactowner_menu_Core {
-  static function admin($menu, $theme) {
+class contactowner_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("contactowner")
diff --git a/modules/developer/helpers/developer_menu.php b/modules/developer/helpers/developer_event.php
similarity index 97%
rename from modules/developer/helpers/developer_menu.php
rename to modules/developer/helpers/developer_event.php
index e5a39b5c..0e3ed49d 100644
--- a/modules/developer/helpers/developer_menu.php
+++ b/modules/developer/helpers/developer_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class developer_menu_Core {
-  static function admin($menu, $theme) {
+class developer_event_Core {
+  static function admin_menu($menu, $theme) {
     $developer_menu = Menu::factory("submenu")
         ->id("developer_menu")
       ->label(t("Developer Tools"));
diff --git a/modules/downloadfullsize/helpers/downloadfullsize_menu.php b/modules/downloadfullsize/helpers/downloadfullsize_event.php
similarity index 92%
rename from modules/downloadfullsize/helpers/downloadfullsize_menu.php
rename to modules/downloadfullsize/helpers/downloadfullsize_event.php
index d7095cc5..99bf42bd 100644
--- a/modules/downloadfullsize/helpers/downloadfullsize_menu.php
+++ b/modules/downloadfullsize/helpers/downloadfullsize_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class downloadfullsize_menu_Core {
-  static function photo($menu, $theme) {
+class downloadfullsize_event_Core {
+  static function photo_menu($menu, $theme) {
     if (access::can("view_full", $theme->item)) {
       if (module::get_var("downloadfullsize", "fButton")) {
         $downloadLink = url::site("downloadfullsize/send/$theme->item");
@@ -32,7 +32,7 @@ class downloadfullsize_menu_Core {
     }
   }
 
-  static function admin($menu, $theme) {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("downloadfullsize")
diff --git a/modules/dynamic/helpers/dynamic_menu.php b/modules/dynamic/helpers/dynamic_event.php
similarity index 93%
rename from modules/dynamic/helpers/dynamic_menu.php
rename to modules/dynamic/helpers/dynamic_event.php
index b2c73d6f..d03943a2 100644
--- a/modules/dynamic/helpers/dynamic_menu.php
+++ b/modules/dynamic/helpers/dynamic_event.php
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class dynamic_menu {
-  static function admin($menu, $theme) {
+class dynamic_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("content_menu")
       ->append(Menu::factory("link")
         ->id("dynamic_menu")
diff --git a/modules/embedlinks/helpers/embedlinks_menu.php b/modules/embedlinks/helpers/embedlinks_event.php
similarity index 93%
rename from modules/embedlinks/helpers/embedlinks_menu.php
rename to modules/embedlinks/helpers/embedlinks_event.php
index 64698e7f..83b461e1 100644
--- a/modules/embedlinks/helpers/embedlinks_menu.php
+++ b/modules/embedlinks/helpers/embedlinks_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class embedlinks_menu_Core {
-  static function admin($menu, $theme) {
+class embedlinks_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("embedlinks")
diff --git a/modules/google_analytics/helpers/google_analytics_menu.php b/modules/google_analytics/helpers/google_analytics_event.php
similarity index 93%
rename from modules/google_analytics/helpers/google_analytics_menu.php
rename to modules/google_analytics/helpers/google_analytics_event.php
index 203af868..e1f2b146 100644
--- a/modules/google_analytics/helpers/google_analytics_menu.php
+++ b/modules/google_analytics/helpers/google_analytics_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class google_analytics_menu {
-  static function admin($menu, $theme) {
+class google_analytics_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("google_analytics_menu")
diff --git a/modules/phpmailer/helpers/phpmailer_menu.php b/modules/phpmailer/helpers/phpmailer_event.php
similarity index 93%
rename from modules/phpmailer/helpers/phpmailer_menu.php
rename to modules/phpmailer/helpers/phpmailer_event.php
index 55e5280f..e5de5170 100644
--- a/modules/phpmailer/helpers/phpmailer_menu.php
+++ b/modules/phpmailer/helpers/phpmailer_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class phpmailer_menu_Core {
-  static function admin($menu, $theme) {
+class phpmailer_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("phpmailer")
diff --git a/modules/tagsmap/helpers/tagsmap_event.php b/modules/tagsmap/helpers/tagsmap_event.php
index eb1afc9a..27b47ca6 100644
--- a/modules/tagsmap/helpers/tagsmap_event.php
+++ b/modules/tagsmap/helpers/tagsmap_event.php
@@ -19,7 +19,7 @@
  */
 class tagsmap_event_Core {
   static function module_change($changes) {
-    // See if the Tags module is installed, 
+    // See if the Tags module is installed,
     //   tell the user to install it if it isn't.
     if (!module::is_active("tag") || in_array("tag", $changes->deactivate)) {
       site_status::warning(
@@ -31,4 +31,13 @@ class tagsmap_event_Core {
       site_status::clear("tagsmap_needs_tag");
     }
   }
+
+  static function admin_menu($menu, $theme) {
+    // Add a link to the TagsMap admin page to the Content menu.
+    $menu->get("content_menu")
+      ->append(Menu::factory("link")
+               ->id("tagsmap")
+               ->label(t("TagsMap Settings"))
+               ->url(url::site("admin/tagsmap")));
+  }
 }
\ No newline at end of file
diff --git a/modules/tagsmap/helpers/tagsmap_menu.php b/modules/tagsmap/helpers/tagsmap_menu.php
deleted file mode 100644
index 3d9c92bb..00000000
--- a/modules/tagsmap/helpers/tagsmap_menu.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program 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 2 of the License, or (at
- * your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class tagsmap_menu_Core {
-  static function admin($menu, $theme) {
-    // Add a link to the TagsMap admin page to the Content menu.
-    $menu->get("content_menu")
-      ->append(Menu::factory("link")
-               ->id("tagsmap")
-               ->label(t("TagsMap Settings"))
-               ->url(url::site("admin/tagsmap")));
-  }
-}