Index: branches/5.2.x/core/admin_templates/config/custom_variables.tpl
===================================================================
diff -u -N -r15437 -r15608
--- branches/5.2.x/core/admin_templates/config/custom_variables.tpl	(.../custom_variables.tpl)	(revision 15437)
+++ branches/5.2.x/core/admin_templates/config/custom_variables.tpl	(.../custom_variables.tpl)	(revision 15608)
@@ -114,7 +114,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="cf_DefaultEmailRecipients_value">
-	<inp2:emailevents.{$PrefixSpecial}_PresetFormFields/>
+	<inp2:email-template.{$PrefixSpecial}_PresetFormFields/>
 
 	<style type="text/css">
 		.grid-edit-table {
@@ -130,15 +130,15 @@
 	</style>
 
 	<table class="grid-edit-table">
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents.{$PrefixSpecial}" field="RecipientType" title="la_fld_RecipientType"/>
-		<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents.{$PrefixSpecial}" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents.{$PrefixSpecial}" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
-		<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents.{$PrefixSpecial}" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template.{$PrefixSpecial}" field="RecipientType" title="la_fld_RecipientType"/>
+		<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template.{$PrefixSpecial}" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="email-template.{$PrefixSpecial}" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
+		<inp2:m_RenderElement name="inp_edit_minput" prefix="email-template.{$PrefixSpecial}" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
 	</table>
 
 	<input type="hidden" name="<inp2:InputName field='VariableValue'/>" value="<inp2:Field field='VariableValue' />"/>
 
-	<inp2:m_RenderElement name="email_recipients_js" prefix="emailevents.{$PrefixSpecial}" to_readonly="0"/>
+	<inp2:m_RenderElement name="email_recipients_js" prefix="email-template.{$PrefixSpecial}" to_readonly="0"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="cf_AllowAdminConsoleInterfaceChange_value">