Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r3576 -r3799
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3576)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3799)
@@ -794,8 +794,8 @@
 				$conditions = Array();
 				foreach($res as $record)
 				{
-					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRATION_NOTICE', $record['PortalUserId']);
-					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION_NOTICE');
+					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId']);
+					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE');
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
 				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroup
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r3576 -r3799
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3576)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3799)
@@ -794,8 +794,8 @@
 				$conditions = Array();
 				foreach($res as $record)
 				{
-					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRATION_NOTICE', $record['PortalUserId']);
-					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION_NOTICE');
+					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId']);
+					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE');
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
 				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroup