Index: branches/5.2.x/core/install/install_schema.sql
===================================================================
diff -u -N -r15602 -r15608
--- branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15602)
+++ branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15608)
@@ -83,9 +83,9 @@
   KEY MailingId (MailingId)
 );
 
-CREATE TABLE EmailEvents (
-  EventId int(11) NOT NULL AUTO_INCREMENT,
-  `Event` varchar(40) NOT NULL DEFAULT '',
+CREATE TABLE EmailTemplates (
+  TemplateId int(11) NOT NULL AUTO_INCREMENT,
+  TemplateName varchar(40) NOT NULL DEFAULT '',
   ReplacementTags text,
   AllowChangingSender tinyint(4) NOT NULL DEFAULT '0',
   CustomSender tinyint(4) NOT NULL DEFAULT '0',
@@ -118,10 +118,10 @@
   `Type` int(11) NOT NULL DEFAULT '0',
   LastChanged int(10) unsigned DEFAULT NULL,
   BindToSystemEvent varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (EventId),
+  PRIMARY KEY (TemplateId),
   KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY `Event` (`Event`),
+  KEY `Event` (TemplateName),
   KEY FrontEndOnly (FrontEndOnly),
   KEY AllowChangingSender (AllowChangingSender),
   KEY CustomSender (CustomSender),
@@ -142,7 +142,7 @@
 
 CREATE TABLE SystemEventSubscriptions (
   SubscriptionId int(11) NOT NULL AUTO_INCREMENT,
-  EmailEventId int(11) DEFAULT NULL,
+  EmailTemplateId int(11) DEFAULT NULL,
   SubscriberEmail varchar(255) NOT NULL DEFAULT '',
   UserId int(11) DEFAULT NULL,
   CategoryId int(11) DEFAULT NULL,
@@ -151,7 +151,7 @@
   ParentItemId int(11) DEFAULT NULL,
   SubscribedOn int(11) DEFAULT NULL,
   PRIMARY KEY (SubscriptionId),
-  KEY EmailEventId (EmailEventId)
+  KEY EmailEventId (EmailTemplateId)
 );
 
 CREATE TABLE IdGenerator (
@@ -414,7 +414,7 @@
   HtmlBody longtext,
   TextBody longtext,
   SentOn int(11) DEFAULT NULL,
-  EventName varchar(255) NOT NULL DEFAULT '',
+  TemplateName varchar(255) NOT NULL DEFAULT '',
   EventType tinyint(4) DEFAULT NULL,
   EventParams text,
   AccessKey varchar(32) NOT NULL DEFAULT '',
