Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r2223 -r2292
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2223)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2292)
@@ -672,8 +672,8 @@
 			{
 				foreach($user_ids as $id)
 				{
-					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP_EXPIRED', $id);
-					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP_EXPIRED');
+					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRED', $id);
+					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRED');
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup
@@ -690,8 +690,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 -r2223 -r2292
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2223)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2292)
@@ -672,8 +672,8 @@
 			{
 				foreach($user_ids as $id)
 				{
-					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP_EXPIRED', $id);
-					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP_EXPIRED');
+					$email_event_user =& $this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRED', $id);
+					$email_event_admin =& $this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRED');
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup
@@ -690,8 +690,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