3 files changed, 7 insertions, 7 deletions

diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index fa175ac8..5a08b693 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -65,7 +65,7 @@ class Login_Controller extends Controller {
         $form->login->inputs["name"]->add_error("invalid_login", 1);
         $name = $form->login->inputs["name"]->value;
         log::warning("user", t("Failed login for %name", array("name" => $name)));
-        module::event("user_authenticate_failed", $name);
+        module::event("user_auth_failed", $name);
         $valid = false;
       }
     }
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 9ce30929..5fa82160 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -113,11 +113,11 @@ class gallery_event_Core {
     auth::clear_failed_attempts($user);
   }
 
-  static function user_authenticate_failed($name) {
+  static function user_auth_failed($name) {
     auth::record_failed_attempt($name);
   }
 
-  static function user_authenticate($user) {
+  static function user_auth($user) {
     auth::clear_failed_attempts($user);
   }
 
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 2675d918..1130852b 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -84,7 +84,7 @@ class Users_Controller extends Controller {
       $user->save();
       module::event("user_change_password_form_completed", $user, $form);
       message::success(t("Password changed"));
-      module::event("user_authenticate", $user);
+      module::event("user_auth", $user);
       module::event("user_password_change", $user);
       print json_encode(
         array("result" => "success",
@@ -92,7 +92,7 @@ class Users_Controller extends Controller {
     } else {
       log::warning("user", t("Failed password change for %name", array("name" => $user->name)));
       $name = $user->name;
-      module::event("user_authenticate_failed", $name);
+      module::event("user_auth_failed", $name);
       print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }
@@ -120,14 +120,14 @@ class Users_Controller extends Controller {
       $user->save();
       module::event("user_change_email_form_completed", $user, $form);
       message::success(t("Email address changed"));
-      module::event("user_authenticate", $user);
+      module::event("user_auth", $user);
       print json_encode(
         array("result" => "success",
               "resource" => url::site("users/{$user->id}")));
     } else {
       log::warning("user", t("Failed email change for %name", array("name" => $user->name)));
       $name = $user->name;
-      module::event("user_authenticate_failed", $name);
+      module::event("user_auth_failed", $name);
       print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }