Index: branches/5.2.x/admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php
===================================================================
diff -u -N -r15268 -r15608
--- branches/5.2.x/admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php	(.../system_event_subscriptions_system-event-subscription.php)	(revision 15268)
+++ branches/5.2.x/admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php	(.../system_event_subscriptions_system-event-subscription.php)	(revision 15608)
@@ -23,30 +23,30 @@
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'SubscriptionId', 'EmailEventId', 'SubscriberEmail', 'UserId', 'CategoryId',
+		/*'SubscriptionId', 'EmailTemplateId', 'SubscriberEmail', 'UserId', 'CategoryId',
 		'ItemId', 'ParentItemId', 'SubscribedOn',*/
 	);
 
 	// virtual fields to hide
 	$virtual_hidden_fields = Array (
-		/*'Username', 'EmailEventName', 'CategoryName',*/
+		/*'Username', 'EmailTemplateName', 'CategoryName',*/
 	);
 
 	// fields to make required
 	$required_fields = Array (
-		/*'SubscriptionId',*/ 'EmailEventId', /*'SubscriberEmail', 'UserId', 'CategoryId',
+		/*'SubscriptionId',*/ 'EmailTemplateId', /*'SubscriberEmail', 'UserId', 'CategoryId',
 		'ItemId', 'ParentItemId',*/ 'SubscribedOn',
 	);
 
 	// virtual fields to make required
 	$virtual_required_fields = Array (
-		/*'Username', 'EmailEventName', 'CategoryName',*/
+		/*'Username', 'EmailTemplateName', 'CategoryName',*/
 	);
 
 	// hide columns in grids
 	$hide_columns = Array (
 		/*'Default' => Array (
-			'SubscriptionId', 'EmailEventId', 'EmailEventName', 'SubscriberEmail', 'UserId', 'Username', 'CategoryId',
+			'SubscriptionId', 'EmailTemplateId', 'EmailTemplateName', 'SubscriberEmail', 'UserId', 'Username', 'CategoryId',
 			'CategoryName', 'ItemId', 'ItemName', 'ParentItemId', 'ParentItemName', 'SubscribedOn',
 		),*/
 	);
\ No newline at end of file