diff --git a/modules/links.php b/modules/links.php
index 8f929b3e..4b1e287a 100644
--- a/modules/links.php
+++ b/modules/links.php
@@ -56,13 +56,13 @@ class links extends module_base
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \phpbb\db\driver */
+	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
 	/** @var \phpbb\request\request */
 	protected $request;
 
-	/** @var \phpbb\template */
+	/** @var \phpbb\template\template */
 	protected $template;
 
 	/** @var string PHP file extension */
@@ -81,9 +81,9 @@ class links extends module_base
 	* Construct a links object
 	*
 	* @param \phpbb\config\config $config phpBB config
-	* @param \phpbb\db\driver $db phpBB db driver
+	* @param \phpbb\db\driver\driver_interface $db phpBB db driver
 	* @param \phpbb\request\request $request phpBB request
-	* @param \phpbb\template $template phpBB template
+	* @param \phpbb\template\template $template phpBB template
 	* @param string $phpEx php file extension
 	* @param string $phpbb_root_path phpBB root path
 	* @param \phpbb\user $user phpBB user object
@@ -113,6 +113,8 @@ class links extends module_base
 		// get user's groups
 		$groups_ary = get_user_groups();
 
+		$this->template->assign_block_vars('portal_links', array('MODULE_ID' => $module_id));
+
 		for ($i = 0; $i < sizeof($links); $i++)
 		{
 			if ($links[$i]['type'] == self::LINK_INT)
@@ -130,7 +132,7 @@ class links extends module_base
 
 			if (!empty($permission_check) || $links[$i]['permission'] == '')
 			{
-				$this->template->assign_block_vars('portallinks', array(
+				$this->template->assign_block_vars('portal_links.links', array(
 					'LINK_TITLE'		=> (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
 					'LINK_URL'			=> $cur_url,
 					'MODULE_ID'			=> $module_id,
diff --git a/styles/prosilver/template/portal/modules/links_side.html b/styles/prosilver/template/portal/modules/links_side.html
index d22f5f83..73201945 100644
--- a/styles/prosilver/template/portal/modules/links_side.html
+++ b/styles/prosilver/template/portal/modules/links_side.html
@@ -1,11 +1,15 @@
+<!-- BEGIN portal_links -->
+<!-- IF portal_links.MODULE_ID eq $MODULE_ID -->
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<div class="portal-navigation">
 			<ul>
-			<!-- BEGIN portallinks -->
-				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><li><a href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>{portallinks.LINK_TITLE}</a></li><!-- ENDIF -->
+			<!-- BEGIN links -->
+				<li><a href="{portal_links.links.LINK_URL}" title="{portal_links.links.LINK_TITLE}" <!-- IF portal_links.links.NEW_WINDOW -->onclick="window.open('{portal_links.links.LINK_URL}'); return false;"<!-- ENDIF -->>{portal_links.links.LINK_TITLE}</a></li>
 			<!-- BEGINELSE -->
 				<span class="portal-title-span gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
-			<!-- END portallinks -->
+			<!-- END links -->
 			</ul>
 	</div>
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+<!-- ENDIF -->
+<!-- END portal_links -->
diff --git a/styles/subsilver2/template/portal/modules/links_side.html b/styles/subsilver2/template/portal/modules/links_side.html
index 7230e1b1..cbc47b35 100644
--- a/styles/subsilver2/template/portal/modules/links_side.html
+++ b/styles/subsilver2/template/portal/modules/links_side.html
@@ -1,9 +1,11 @@
+<!-- BEGIN portal_links -->
+<!-- IF portal_links.MODULE_ID eq $MODULE_ID -->
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 <table class="tablebg" cellspacing="1" width="100%">
-	<!-- BEGIN portallinks -->
+	<!-- BEGIN links -->
 		<tr class="row1">
 			<td>
-				<!-- IF $MODULE_ID eq portallinks.MODULE_ID --><a class="portal-arrow-bullet" href="{portallinks.LINK_URL}" title="{portallinks.LINK_TITLE}" <!-- IF portallinks.NEW_WINDOW -->onclick="window.open('{portallinks.LINK_URL}'); return false;"<!-- ENDIF -->>&nbsp;{portallinks.LINK_TITLE}</a><!-- ENDIF -->
+				<a class="portal-arrow-bullet" href="{portal_links.links.LINK_URL}" title="{portal_links.links.LINK_TITLE}" <!-- IF portal_links.links.NEW_WINDOW -->onclick="window.open('{portal_links.links.LINK_URL}'); return false;"<!-- ENDIF -->>&nbsp;{portal_links.links.LINK_TITLE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -12,6 +14,8 @@
 				<span style="float: left" class="gensmall"><strong>{L_LINKS_NO_LINKS}</strong></span><br />
 			</td>
 		</tr>
-	<!-- END portallinks -->
+	<!-- END links -->
 </table>
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+<!-- ENDIF -->
+<!-- END portal_links -->