diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 74bbc675d2..f6a92aaf69 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -119,35 +119,35 @@ ucp_pm_viewmessage_print_head_append
 * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
 * Purpose: Add asset calls directly before the `</head>` tag of the Print PM screen
 
-ucp_prefs_personal_before
+ucp_prefs_personal_prepend
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_personal.html
     + styles/subsilver2/template/ucp_prefs_personal.html
 * Purpose: Add user options to the top of the Edit Global Settings screen
 
-ucp_prefs_personal_after
+ucp_prefs_personal_append
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_personal.html
     + styles/subsilver2/template/ucp_prefs_personal.html
 * Purpose: Add user options to the bottom of the Edit Global Settings screen
 
-ucp_prefs_post_before
+ucp_prefs_post_prepend
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_post.html
     + styles/subsilver2/template/ucp_prefs_post.html
 * Purpose: Add user options to the top of the Edit Posting Defaults screen
 
-ucp_prefs_post_after
+ucp_prefs_post_append
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_post.html
     + styles/subsilver2/template/ucp_prefs_post.html
 * Purpose: Add user options to the bottom of the Edit Posting Defaults screen
 
-ucp_prefs_view_radio_buttons_before
+ucp_prefs_view_radio_buttons_prepend
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_view.html
@@ -155,7 +155,7 @@ ucp_prefs_view_radio_buttons_before
 * Purpose: Add options to the top of the radio buttons section of the Edit 
 Display Options screen
 
-ucp_prefs_view_radio_buttons_after
+ucp_prefs_view_radio_buttons_append
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_view.html
@@ -163,7 +163,7 @@ ucp_prefs_view_radio_buttons_after
 * Purpose: Add options to the bottom of the radio buttons section of the Edit 
 Display Options screen
 
-ucp_prefs_view_select_menu_before
+ucp_prefs_view_select_menu_prepend
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_view.html
@@ -171,7 +171,7 @@ ucp_prefs_view_select_menu_before
 * Purpose: Add options to the top of the drop down menus section of the Edit 
 Display Options screen
 
-ucp_prefs_view_select_menu_after
+ucp_prefs_view_select_menu_append
 ===
 * Locations:
     + styles/prosilver/template/ucp_prefs_view.html
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 4484dd7a55..8111496dcb 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -9,7 +9,7 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<!-- EVENT ucp_prefs_personal_before -->
+	<!-- EVENT ucp_prefs_personal_prepend -->
 	<dl>
 		<dt><label for="viewemail0">{L_SHOW_EMAIL}{L_COLON}</label></dt>
 		<dd>
@@ -72,7 +72,7 @@
 		</dd>
 		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd>
 	</dl>
-	<!-- EVENT ucp_prefs_personal_after -->
+	<!-- EVENT ucp_prefs_personal_append -->
 	</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html
index 2b8fea832a..891e49af6f 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_post.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html
@@ -8,7 +8,7 @@
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-	<!-- EVENT ucp_prefs_post_before -->
+	<!-- EVENT ucp_prefs_post_prepend -->
 	<dl>
 		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
 		<dd>
@@ -37,7 +37,7 @@
 			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
-	<!-- EVENT ucp_prefs_post_after -->
+	<!-- EVENT ucp_prefs_post_append -->
 	</fieldset>
 	
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html
index 55e5531075..7f8d0a344c 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_view.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_view.html
@@ -9,7 +9,7 @@
 
 		<fieldset>
 		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-		<!-- EVENT ucp_prefs_view_radio_buttons_before -->
+		<!-- EVENT ucp_prefs_view_radio_buttons_prepend -->
 		<dl>
 			<dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt>
 			<dd>
@@ -54,9 +54,9 @@
 				</dd>
 			</dl>
 		<!-- ENDIF -->
-		<!-- EVENT ucp_prefs_view_radio_buttons_after -->
+		<!-- EVENT ucp_prefs_view_radio_buttons_append -->
 		<hr />
-		<!-- EVENT ucp_prefs_view_select_menu_before -->
+		<!-- EVENT ucp_prefs_view_select_menu_prepend -->
 		<dl>
 			<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
 			<dd>{S_TOPIC_SORT_DAYS}</dd>
@@ -82,7 +82,7 @@
 			<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>
 			<dd>{S_POST_SORT_DIR}</dd>
 		</dl>
-		<!-- EVENT ucp_prefs_view_select_menu_after -->
+		<!-- EVENT ucp_prefs_view_select_menu_append -->
 		</fieldset>
 
 	</div>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index f39090c8fe..cd5fc9a13f 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -29,7 +29,7 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<!-- EVENT ucp_prefs_personal_before -->
+<!-- EVENT ucp_prefs_personal_prepend -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}{L_COLON}</b></td>
 	<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
@@ -76,7 +76,7 @@
 		<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div>
 	</td>
 </tr>
-<!-- EVENT ucp_prefs_personal_after -->
+<!-- EVENT ucp_prefs_personal_append -->
 <tr>
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_post.html b/phpBB/styles/subsilver2/template/ucp_prefs_post.html
index 5dcd431e82..0a558b863c 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_post.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_post.html
@@ -9,7 +9,7 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<!-- EVENT ucp_prefs_post_before -->
+<!-- EVENT ucp_prefs_post_prepend -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_BBCODE}{L_COLON}</b></td>
 	<td class="row2"><input type="radio" class="radio" name="bbcode" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="bbcode" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
@@ -26,7 +26,7 @@
 	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_NOTIFY}{L_COLON}</b></td>
 	<td class="row2"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
 </tr>
-<!-- EVENT ucp_prefs_post_after -->
+<!-- EVENT ucp_prefs_post_append -->
 <tr>
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_view.html b/phpBB/styles/subsilver2/template/ucp_prefs_view.html
index c9336a4da5..c10c458627 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_view.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_view.html
@@ -9,7 +9,7 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<!-- EVENT ucp_prefs_view_radio_buttons_before -->
+<!-- EVENT ucp_prefs_view_radio_buttons_prepend -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_VIEW_IMAGES}{L_COLON}</b></td>
 	<td class="row2"><input type="radio" class="radio" name="images" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="images" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
@@ -36,11 +36,11 @@
 		<td class="row2"><input type="radio" class="radio" name="wordcensor" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" class="radio" name="wordcensor" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>
 	</tr>
 <!-- ENDIF -->
-<!-- EVENT ucp_prefs_view_radio_buttons_after -->
+<!-- EVENT ucp_prefs_view_radio_buttons_append -->
 <tr>
 	<td colspan="2" class="spacer"></td>
 </tr>
-<!-- EVENT ucp_prefs_view_select_menu_before -->
+<!-- EVENT ucp_prefs_view_select_menu_prepend -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DAYS}{L_COLON}</b></td>
 	<td class="row2">{S_TOPIC_SORT_DAYS}</td>
@@ -68,7 +68,7 @@
 	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DIR}{L_COLON}</b></td>
 	<td class="row2">{S_POST_SORT_DIR}</td>
 </tr>
-<!-- EVENT ucp_prefs_view_select_menu_after -->
+<!-- EVENT ucp_prefs_view_select_menu_append -->
 <tr>
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
 </tr>