Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql
===================================================================
diff -u -r2261 -r2263
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql	(.../inportal_upgrade_v1.1.1.sql)	(revision 2261)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql	(.../inportal_upgrade_v1.1.1.sql)	(revision 2263)
@@ -26,10 +26,10 @@
 INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.MODIFY', -1, 0, 0, 0);
 INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('FAVORITES', -1, 0, 0, 0);
 
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '0');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '1');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRATION_NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRATION_NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '0');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '1');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
 
 ALTER TABLE UserGroup ADD MembershipExpires INT UNSIGNED DEFAULT NULL AFTER GroupId;
 ALTER TABLE PersistantSessionData ADD PRIMARY KEY (PortalUserId, VariableName);
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -r2234 -r2263
--- trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 2234)
+++ trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 2263)
@@ -191,10 +191,10 @@
 INSERT INTO Events VALUES (64, 'USER.SUGGEST', '1', '0', 'In-Portal:Users', 'la_event_user.suggest', '0');
 INSERT INTO Events VALUES (65, 'USER.SUGGEST', '2', '0', 'In-Portal:Users', 'la_event_user.suggest', '1');
 INSERT INTO Events VALUES (67, 'USER.PSWDC', '1', '0', 'In-Portal:Users', 'la_event_user.pswd_confirm', '0');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '0');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '1');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRATION_NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
-INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRATION_NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '0');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '1');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
+INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
 
 INSERT INTO IdGenerator VALUES ('100');