diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index adfdfdaf56..b44c033a25 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,7 +29,7 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index c78094ec79..6861b90381 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -7,7 +7,7 @@
 
 		<ul class="linklist">
 			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
-				<!-- RUNHOOKS overall_footer_index_link --></li>
+				<!-- EVENT overall_footer_index_link --></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF U_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="<!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
@@ -57,6 +57,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index fc0c391d9d..2440e7a4e3 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,10 +84,10 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
@@ -124,7 +124,7 @@
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
 				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
-					<!-- RUNHOOKS overall_header_index_link -->
+					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
@@ -149,7 +149,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- RUNHOOKS overall_header_nav -->
+				<!-- EVENT overall_header_nav -->
 				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 776997eb91..0f3522bb15 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,7 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
-			<!-- RUNHOOKS posting_editor_options -->
+			<!-- EVENT posting_editor_options -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index e86db12d54..b7767a3a98 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,6 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a70e33b619..a53c0d6e8f 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index ff65f6f91e..7cf0124626 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 6861ae799a..8ceb2921eb 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,7 +18,7 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 781cdd6b0b..9dd9681b80 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<span class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
@@ -13,6 +13,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 7f60d7012d..b64bd773f9 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -130,10 +130,10 @@ function marklist(id, name, state)
 // ]]>
 </script>
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 88d001946f..0352baca87 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,7 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
-		<!-- RUNHOOKS posting_editor_options -->
+		<!-- EVENT posting_editor_options -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 3ef060fad7..bbbc0aaff8 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,6 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 0ecf36709d..fe64b4e402 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,7 +55,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 100157e704..8fe7d97524 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,7 +67,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
