diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 2998a7e416..4b747c9396 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -797,7 +797,7 @@ ucp_prefs_view_select_menu_append
 * Purpose: Add options to the bottom of the drop-down lists block of the Edit 
 Display Options screen
 
-ucp_register_before
+ucp_register_credentials_before
 ===
 * Locations:
     + styles/prosilver/template/ucp_register.html
@@ -805,7 +805,7 @@ ucp_register_before
 * Since: 3.1.0-b5
 * Purpose: Add options in registration page fieldset - before first field.
 
-ucp_register_after
+ucp_register_progile_fields_after
 ===
 * Locations:
     + styles/prosilver/template/ucp_register.html
@@ -813,7 +813,7 @@ ucp_register_after
 * Since: 3.1.0-b5
 * Purpose: Add options in registration page fieldset - after last field.
 
-ucp_register_password_after
+ucp_register_credentials_after
 ===
 * Locations:
     + styles/prosilver/template/ucp_register.html
@@ -821,7 +821,7 @@ ucp_register_password_after
 * Since: 3.1.0-b5
 * Purpose: Add options in registration page fieldset - after password field.
 
-ucp_register_language_before
+ucp_register_options_before
 ===
 * Locations:
     + styles/prosilver/template/ucp_register.html
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 62e7d3dfaf..020f69cb26 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -26,7 +26,7 @@
 	<!-- IF L_REG_COND -->
 		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
 	<!-- ENDIF -->
-	<!-- EVENT ucp_register_before -->
+	<!-- EVENT ucp_register_credentials_before -->
 	<dl>
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
 		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
@@ -44,10 +44,10 @@
 		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
 	</dl>
 
-	<!-- EVENT ucp_register_password_after -->
+	<!-- EVENT ucp_register_credentials_after -->
 	<hr />
 
-	<!-- EVENT ucp_register_language_before -->
+	<!-- EVENT ucp_register_options_before -->
 	<dl>
 		<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>
 		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
@@ -55,10 +55,10 @@
 
 	<!-- INCLUDE timezone_option.html -->
 
+	<!-- EVENT ucp_register_profile_fields_before -->
 	<!-- IF .profile_fields -->
 		<dl><dd><strong>{L_ITEMS_REQUIRED}</strong></dd></dl>
 
-	<!-- EVENT ucp_register_profile_fields_before -->
 	<!-- BEGIN profile_fields -->
 		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
@@ -69,7 +69,7 @@
 	<!-- END profile_fields -->
 	<!-- ENDIF -->
 
-	<!-- EVENT ucp_register_after -->
+	<!-- EVENT ucp_register_profile_fields_after -->
 	</fieldset>
 	</div>
 </div>
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index 5cfb158646..76f458ffb0 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -34,7 +34,7 @@
 	</tr>
 <!-- ENDIF -->
 
-<!-- EVENT ucp_register_before -->
+<!-- EVENT ucp_register_credentials_before -->
 <tr>
 	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
 	<td class="row2"><input class="post" type="text" name="username" size="25" value="{USERNAME}" /></td>
@@ -51,8 +51,8 @@
 	<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="password" name="password_confirm" size="25" value="{PASSWORD_CONFIRM}" /></td>
 </tr>
-<!-- EVENT ucp_register_password_after -->
-<!-- EVENT ucp_register_language_before -->
+<!-- EVENT ucp_register_credentials_after -->
+<!-- EVENT ucp_register_options_before -->
 <tr>
 	<td class="row1"><b class="genmed">{L_LANGUAGE}{L_COLON} </b></td>
 	<td class="row2"><select name="lang" onchange="change_language(this.value); return false;">{S_LANG_OPTIONS}</select></td>
@@ -77,7 +77,7 @@
 	
 <!-- END profile_fields -->
 <!-- ENDIF -->
-<!-- EVENT ucp_register_after -->
+<!-- EVENT ucp_register_profile_fields_after -->
 		<!-- IF CAPTCHA_TEMPLATE -->
 		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 		<!-- ENDIF -->