diff --git a/e107_core/templates/navigation_template.php b/e107_core/templates/navigation_template.php
index ef9ae538e..818874e4d 100644
--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -13,8 +13,8 @@ $NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav nav-main ml-a
 // Main Link
 $NAVIGATION_TEMPLATE['main']['item'] = '
 	<li class="nav-item">
-		<a  class="nav-link"  role="button" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
-		 {LINK_ICON}{LINK_NAME} 
+		<a  class="nav-link"  role="button" href="{NAV_LINK_URL}"{NAV_LINK_OPEN} title="{NAV_LINK_DESCRIPTION}">
+		 {NAV_LINK_ICON}{NAV_LINK_NAME} 
 		</a> 
 	</li>
 ';
@@ -22,31 +22,31 @@ $NAVIGATION_TEMPLATE['main']['item'] = '
 // Main Link - active state
 $NAVIGATION_TEMPLATE['main']['item_active'] = '
 	<li class="nav-item active">
-		<a class="nav-link e-tip" role="button"  data-target="#" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
-		 {LINK_ICON} {LINK_NAME}
+		<a class="nav-link e-tip" role="button"  data-target="#" href="{NAV_LINK_URL}"{NAV_LINK_OPEN} title="{NAV_LINK_DESCRIPTION}">
+		 {NAV_LINK_ICON} {NAV_LINK_NAME}
 		</a>
 	</li>
 ';
 
 // Main Link which has a sub menu. 
 $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
-	<li class="nav-item dropdown {LINK_IDENTIFIER}">
-		<a class="nav-link dropdown-toggle"  role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
-		 {LINK_ICON}{LINK_NAME} 
+	<li class="nav-item dropdown {NAV_LINK_IDENTIFIER}">
+		<a class="nav-link dropdown-toggle"  role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{NAV_LINK_URL}" title="{NAV_LINK_DESCRIPTION}">
+		 {NAV_LINK_ICON}{NAV_LINK_NAME} 
 		 <span class="caret"></span>
 		</a> 
-		{LINK_SUB}
+		{NAV_LINK_SUB}
 	</li>
 ';
 
 // Main Link which has a sub menu - active state.
 $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
-	<li class="nav-item dropdown active {LINK_IDENTIFIER}">
-		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}">
-		 {LINK_ICON}{LINK_NAME}
+	<li class="nav-item dropdown active {NAV_LINK_IDENTIFIER}">
+		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{NAV_LINK_URL}">
+		 {NAV_LINK_ICON}{NAV_LINK_NAME}
 		 <span class="caret"></span>
 		</a>
-		{LINK_SUB}
+		{NAV_LINK_SUB}
 	</li>
 ';	
 
@@ -54,41 +54,41 @@ $NAVIGATION_TEMPLATE['main']['end'] = '</ul>';
 
 // Sub menu 
 $NAVIGATION_TEMPLATE['main']['submenu_start'] = '
-		<ul class="dropdown-menu submenu-start submenu-level-{LINK_DEPTH}" role="menu" >
+		<ul class="dropdown-menu submenu-start submenu-level-{NAV_LINK_DEPTH}" role="menu" >
 ';
 
 // Sub menu Link 
 $NAVIGATION_TEMPLATE['main']['submenu_item'] = '
-			<li role="menuitem" class="link-depth-{LINK_DEPTH}">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
+			<li role="menuitem" class="link-depth-{NAV_LINK_DEPTH}">
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
 			</li>
 ';
 
 // Sub menu Link - active state
 $NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
-			<li role="menuitem" class="active link-depth-{LINK_DEPTH}">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
+			<li role="menuitem" class="active link-depth-{NAV_LINK_DEPTH}">
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
 			</li>
 ';
 $NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';
 
 // Sub menu
 $NAVIGATION_TEMPLATE['main']['submenu_lowerstart'] = '
-		<ul class="dropdown-menu submenu-start lower submenu-level-{LINK_DEPTH}" role="menu" >
+		<ul class="dropdown-menu submenu-start lower submenu-level-{NAV_LINK_DEPTH}" role="menu" >
 ';
 
 // Sub Menu Link which has a sub menu. 
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu lower">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
+				{NAV_LINK_SUB}
 			</li>
 ';
 
 $NAVIGATION_TEMPLATE['main']['submenu_loweritem_active'] = '
 			<li role="menuitem" class="dropdown-submenu active">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
+				{NAV_LINK_SUB}
 			</li>
 ';
 
@@ -101,13 +101,13 @@ $NAVIGATION_TEMPLATE['main']['submenu_lowerend'] = '</ul>';
 $NAVIGATION_TEMPLATE['side']['start'] 				= '<ul class="listgroup nav-side">
 														';
 
-$NAVIGATION_TEMPLATE['side']['item'] 				= '<li class="list-group-item"><a href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['side']['item'] 				= '<li class="list-group-item"><a href="{NAV_LINK_URL}"{NAV_LINK_OPEN} title="{NAV_LINK_DESCRIPTION}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>
 														';
 
-$NAVIGATION_TEMPLATE['side']['item_submenu'] 		= '<li class="nav-header">{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>
+$NAVIGATION_TEMPLATE['side']['item_submenu'] 		= '<li class="nav-header">{NAV_LINK_ICON}{NAV_LINK_NAME}{NAV_LINK_SUB}</li>
 														';
 
-$NAVIGATION_TEMPLATE['side']['item_active'] 		= '<li class="list-group-item active"{LINK_OPEN}><a class="list-group-item active" href="{LINK_URL}" title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['side']['item_active'] 		= '<li class="list-group-item active"{NAV_LINK_OPEN}><a class="list-group-item active" href="{NAV_LINK_URL}" title="{NAV_LINK_DESCRIPTION}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>
 														';
 
 $NAVIGATION_TEMPLATE['side']['end'] 				= '</ul>
@@ -115,16 +115,16 @@ $NAVIGATION_TEMPLATE['side']['end'] 				= '</ul>
 
 $NAVIGATION_TEMPLATE['side']['submenu_start'] 		= '';
 
-$NAVIGATION_TEMPLATE['side']['submenu_item']		= '<li class="list-group-item" ><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
+$NAVIGATION_TEMPLATE['side']['submenu_item']		= '<li class="list-group-item" ><a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>';
 
 $NAVIGATION_TEMPLATE['side']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
+				{NAV_LINK_SUB}
 			</li>
 ';
 
-$NAVIGATION_TEMPLATE['side']['submenu_item_active'] = '<li class="active"><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>';
+$NAVIGATION_TEMPLATE['side']['submenu_item_active'] = '<li class="active"><a href="{NAV_LINK_URL}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>';
 
 $NAVIGATION_TEMPLATE['side']['submenu_end'] 		= '';
 
@@ -132,27 +132,27 @@ $NAVIGATION_TEMPLATE['side']['submenu_end'] 		= '';
 // Footer links.  - ie. 3 columns of links. 
 
 $NAVIGATION_TEMPLATE["footer"]["start"] 				= "<ul class='list-unstyled nav-footer row'>\n";
-$NAVIGATION_TEMPLATE["footer"]["item"] 					= "<li class='col-md-4'><a href='{LINK_URL}'{LINK_OPEN} title=\"{LINK_DESCRIPTION}\">{LINK_ICON}{LINK_NAME}</a></li>\n";
-$NAVIGATION_TEMPLATE["footer"]["item_submenu"] 			= "<li class='nav-header col-md-4'>{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>\n";
-$NAVIGATION_TEMPLATE["footer"]["item_active"] 			= "<li class='active'{LINK_OPEN}><a href='{LINK_URL}' title=\"{LINK_DESCRIPTION}\">{LINK_ICON}{LINK_NAME}</a></li>\n";
+$NAVIGATION_TEMPLATE["footer"]["item"] 					= "<li class='col-md-4'><a href='{NAV_LINK_URL}'{NAV_LINK_OPEN} title=\"{NAV_LINK_DESCRIPTION}\">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>\n";
+$NAVIGATION_TEMPLATE["footer"]["item_submenu"] 			= "<li class='nav-header col-md-4'>{NAV_LINK_ICON}{NAV_LINK_NAME}{NAV_LINK_SUB}</li>\n";
+$NAVIGATION_TEMPLATE["footer"]["item_active"] 			= "<li class='active'{NAV_LINK_OPEN}><a href='{NAV_LINK_URL}' title=\"{NAV_LINK_DESCRIPTION}\">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>\n";
 $NAVIGATION_TEMPLATE["footer"]["end"] 					= "</ul>\n";
 $NAVIGATION_TEMPLATE["footer"]["submenu_start"] 		= "<ul class='list-unstyled'>";
-$NAVIGATION_TEMPLATE["footer"]["submenu_item"]			= "<li><a href='{LINK_URL}'{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>\n";
-$NAVIGATION_TEMPLATE["footer"]["submenu_loweritem"] 	= "<li><a href='{LINK_URL}'{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>{LINK_SUB}</li>\n";
-$NAVIGATION_TEMPLATE["footer"]["submenu_item_active"] 	= "<li class='active'><a href='{LINK_URL}'>{LINK_ICON}{LINK_NAME}</a></li>\n";
+$NAVIGATION_TEMPLATE["footer"]["submenu_item"]			= "<li><a href='{NAV_LINK_URL}'{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>\n";
+$NAVIGATION_TEMPLATE["footer"]["submenu_loweritem"] 	= "<li><a href='{NAV_LINK_URL}'{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>{NAV_LINK_SUB}</li>\n";
+$NAVIGATION_TEMPLATE["footer"]["submenu_item_active"] 	= "<li class='active'><a href='{NAV_LINK_URL}'>{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>\n";
 $NAVIGATION_TEMPLATE["footer"]["submenu_end"] 			= "</ul>";
 
 
 $NAVIGATION_TEMPLATE['alt']['start'] 				= '<ul class="nav nav-list">
 														';
 
-$NAVIGATION_TEMPLATE['alt']['item'] 				= '<li><a href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['alt']['item'] 				= '<li><a href="{NAV_LINK_URL}"{NAV_LINK_OPEN} title="{NAV_LINK_DESCRIPTION}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>
 														';
 
-$NAVIGATION_TEMPLATE['alt']['item_submenu'] 		= '<li class="nav-header">{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>
+$NAVIGATION_TEMPLATE['alt']['item_submenu'] 		= '<li class="nav-header">{NAV_LINK_ICON}{NAV_LINK_NAME}{NAV_LINK_SUB}</li>
 														';
 
-$NAVIGATION_TEMPLATE['alt']['item_active'] 		= '<li class="active"{LINK_OPEN}><a href="{LINK_URL}" title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
+$NAVIGATION_TEMPLATE['alt']['item_active'] 		= '<li class="active"{NAV_LINK_OPEN}><a href="{NAV_LINK_URL}" title="{NAV_LINK_DESCRIPTION}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>
 														';
 
 $NAVIGATION_TEMPLATE['alt']['end'] 				= '</ul>
@@ -160,16 +160,16 @@ $NAVIGATION_TEMPLATE['alt']['end'] 				= '</ul>
 
 $NAVIGATION_TEMPLATE['alt']['submenu_start'] 		= '';
 
-$NAVIGATION_TEMPLATE['alt']['submenu_item']		= '<li><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
+$NAVIGATION_TEMPLATE['alt']['submenu_item']		= '<li><a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>';
 
 $NAVIGATION_TEMPLATE['alt']['submenu_loweritem'] = '
 			<li role="menuitem" class="dropdown-submenu">
-				<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
-				{LINK_SUB}
+				<a href="{NAV_LINK_URL}"{NAV_LINK_OPEN}>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
+				{NAV_LINK_SUB}
 			</li>
 ';
 
-$NAVIGATION_TEMPLATE['alt']['submenu_item_active'] = '<li class="active"><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>';
+$NAVIGATION_TEMPLATE['alt']['submenu_item_active'] = '<li class="active"><a href="{NAV_LINK_URL}">{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>';
 
 $NAVIGATION_TEMPLATE['alt']['submenu_end'] 		= '';