rename bitboards to boards

17 files changed, 68 insertions, 68 deletions

diff --git a/templates/admin_bitboards.tpl b/templates/admin_boards.tpl
index 083adf6..ccd83e4 100644
--- a/templates/admin_bitboards.tpl
+++ b/templates/admin_boards.tpl
@@ -7,8 +7,8 @@
 			{formlabel label="Home BitBoards (main bitboard)" for="homeBitBoards"}
 			{forminput}
 				<select name="homeBitBoards" id="homeBitBoards">
-					{section name=ix loop=$bitboards}
-						<option value="{$bitboards[ix].bitboards_id|escape}" {if $bitboards[ix].bitboards_id eq $home_bitboard}selected="selected"{/if}>{$bitboards[ix].title|escape|truncate:20:"...":true}</option>
+					{section name=ix loop=$boards}
+						<option value="{$boards[ix].boards_id|escape}" {if $boards[ix].boards_id eq $home_bitboard}selected="selected"{/if}>{$boards[ix].title|escape|truncate:20:"...":true}</option>
 					{sectionelse}
 						<option>{tr}No records found{/tr}</option>
 					{/section}
diff --git a/templates/bitboards_service_icons.tpl b/templates/bitboards_service_icons.tpl
deleted file mode 100644
index 7f76b33..0000000
--- a/templates/bitboards_service_icons.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{if $boardInfo.board_id}
-	<a title="{tr}Discussion{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}?b={$boardInfo.board_id}&amp;filter_id={$gContent->mContentId}">{biticon ipackage="bitboards" iname="discuss_small" iexplain="Discuss"} [<strong>{$boardInfo.post_count}</strong>]</a>
-{/if}
diff --git a/templates/board_assign.tpl b/templates/board_assign.tpl
index 3721879..aae2309 100644
--- a/templates/board_assign.tpl
+++ b/templates/board_assign.tpl
@@ -55,7 +55,7 @@
 				{form legend="<a href=\"`$board.url`\">`$board.title`</a>" id="board`$smarty.foreach.board_loop.iteration`"}
 					{if ! $board.integrity}
 						<div class="floaticon">
-							<a href="{$smarty.const.BITBOARDS_PKG_URL}assign.php?integrity={$board.board_id}#board{$smarty.foreach.board_loop.iteration}">
+							<a href="{$smarty.const.BOARDS_PKG_URL}assign.php?integrity={$board.board_id}#board{$smarty.foreach.board_loop.iteration}">
 								{biticon ipackage="icons" iname="dialog-warning" ipath="large" iexplain="Fix Integrity"}
 							</a>
 						</div>
@@ -78,7 +78,7 @@
 								<td style="text-align:right">{$mapping.thread_count}</td>
 								<td class="actionicon">
 									<input type="checkbox" name="remove[{$board.board_id}][{$mapping.t_content_id}]" value="1" />
-									<a title="{tr}Remove from board{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}assign.php?remove[{$board.board_id}][{$mapping.t_content_id}]=1#board{$smarty.foreach.board_loop.iteration}">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove from board"}</a>
+									<a title="{tr}Remove from board{/tr}" href="{$smarty.const.BOARDS_PKG_URL}assign.php?remove[{$board.board_id}][{$mapping.t_content_id}]=1#board{$smarty.foreach.board_loop.iteration}">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove from board"}</a>
 								</td>
 							</tr>
 						{/foreach}
diff --git a/templates/board_cat.tpl b/templates/board_cat.tpl
index 033a3c0..581cb78 100644
--- a/templates/board_cat.tpl
+++ b/templates/board_cat.tpl
@@ -7,12 +7,12 @@
 		{/if}
 		<div id="bcat{$child.data.content_id|default:none}">
 			{if count($child.members) > 0}
-				{include file="bitpackage:bitboards/board_table.tpl" boardsList=$child.members heading=$heading}
+				{include file="bitpackage:boards/board_table.tpl" boardsList=$child.members heading=$heading}
 			{/if}
 
 			{if !empty($child.sub_count) && count($child.children)>0}
 				{foreach from=$child.children item=schild}
-					{include file="bitpackage:bitboards/board_cat.tpl" child=$schild color=$color}
+					{include file="bitpackage:boards/board_cat.tpl" child=$schild color=$color}
 				{/foreach}
 			{/if}
 		</div>
diff --git a/templates/board_table.tpl b/templates/board_table.tpl
index 83d3cb5..1363b0c 100644
--- a/templates/board_table.tpl
+++ b/templates/board_table.tpl
@@ -28,7 +28,7 @@
 						&nbsp;by&nbsp;
 						{if $board.last.user_id < 0}{$board.last.l_anon_name|escape}{else}{displayname user_id=$board.last.user_id}{/if}
 					{/if}
-					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+					{if $gBitUser->hasPermission('p_boards_edit') || $gBitUser->hasPermission('p_boards_post_edit')}
 						{if $board.unreg > 0}<a class="highlight" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}</a>{/if}
 					{/if}
 				</span>
diff --git a/templates/bitboards_edit_mini_inc.tpl b/templates/boards_edit_mini_inc.tpl
index bcea076..99263a5 100644
--- a/templates/bitboards_edit_mini_inc.tpl
+++ b/templates/boards_edit_mini_inc.tpl
@@ -1,4 +1,4 @@
-{if $gBitUser->hasPermission('p_bitboards_link_content') && $gContent->mContentTypeGuid != $smarty.const.BITBOARD_CONTENT_TYPE_GUID}
+{if $gBitUser->hasPermission('p_boards_link_content') && $gContent->mContentTypeGuid != $smarty.const.BITBOARD_CONTENT_TYPE_GUID}
 {* {$gContent->mContentTypeGuid} *}
 <div class="row">
 	{formlabel label="Linked Board"}
diff --git a/templates/boards_service_icons.tpl b/templates/boards_service_icons.tpl
new file mode 100644
index 0000000..8eef76a
--- /dev/null
+++ b/templates/boards_service_icons.tpl
@@ -0,0 +1,3 @@
+{if $boardInfo.board_id}
+	<a title="{tr}Discussion{/tr}" href="{$smarty.const.BOARDS_PKG_URL}?b={$boardInfo.board_id}&amp;filter_id={$gContent->mContentId}">{biticon ipackage="boards" iname="discuss_small" iexplain="Discuss"} [<strong>{$boardInfo.post_count}</strong>]</a>
+{/if}
diff --git a/templates/flipswitch.tpl b/templates/flipswitch.tpl
index d5f007c..8087097 100644
--- a/templates/flipswitch.tpl
+++ b/templates/flipswitch.tpl
@@ -13,7 +13,7 @@ $flip_downname=>$flip.$flip_name.downname
 {if $gBitUser->hasPermission( $flip.$flip_name.perm )}
 	<span>
 		<a onclick="
-		var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&amp;seq='
+		var url = '{$smarty.const.BOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&amp;seq='
 			+ new Date().getTime()+
 			'&amp;{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"}
 			&amp;{$flip_name}={$flip.$flip_name.state|escape:"url"}';
@@ -25,7 +25,7 @@ $flip_downname=>$flip.$flip_name.downname
 			{ldelim}method: 'get', parameters: params, onFailure: reportError{rdelim}
 		);
 		return false;
-		" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?
+		" href="{$smarty.const.BOARDS_PKG_URL}topic.php?
 			{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"}
 			&amp;{$flip_name}={$flip.$flip_name.state|escape:"url"}">
 
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 4e11ad1..99e392c 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,5 +1,5 @@
-{if $smarty.const.ACTIVE_PACKAGE == 'bitboards'}
-	<link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.BITBOARDS_PKG_URL}styles/bitboards.css" media="all" />
+{if $smarty.const.ACTIVE_PACKAGE == 'boards'}
+	<link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.BOARDS_PKG_URL}styles/boards.css" media="all" />
 	<script type="text/javascript">/* <![CDATA[ */
 		{literal}
 		function reportError(request) {
@@ -33,7 +33,7 @@
 	/* ]]> */</script>
 
 	{if $gBitSystem->isPackageActive( 'rss' ) && !empty($board)}
-		<link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title|escape} RSS" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=rss20&amp;b={$smarty.request.b}" />
-		<link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title|escape} ATOM" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=atom&amp;b={$smarty.request.b}" />
+		<link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title|escape} RSS" href="{$smarty.const.BOARDS_PKG_URL}boards_rss.php?version=rss20&amp;b={$smarty.request.b}" />
+		<link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title|escape} ATOM" href="{$smarty.const.BOARDS_PKG_URL}boards_rss.php?version=atom&amp;b={$smarty.request.b}" />
 	{/if}
 {/if}
diff --git a/templates/list_boards.tpl b/templates/list_boards.tpl
index 82751e1..a43070b 100644
--- a/templates/list_boards.tpl
+++ b/templates/list_boards.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_boards.tpl,v 1.2 2007/02/16 21:05:41 nickpalmer Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_boards.tpl,v 1.3 2007/03/31 15:54:14 squareing Exp $ *}
 {strip}
 <div class="listing bitboard">
 	<div class="header">
@@ -9,11 +9,11 @@
 		{foreach from=$ns item=child}
 			{assign var=heading value=1}
 			{if $child.sub_count > 0}
-				{include file="bitpackage:bitboards/board_cat.tpl" child=$child color=$color}
+				{include file="bitpackage:boards/board_cat.tpl" child=$child color=$color}
 			{/if}
 		{/foreach}
 
-		{include file="bitpackage:bitboards/legend_inc.tpl"  boardicons=1}
+		{include file="bitpackage:boards/legend_inc.tpl"  boardicons=1}
 	</div><!-- end .body -->
 </div><!-- end .admin -->
 {/strip}
diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl
index 220ee4c..2dde38f 100644
--- a/templates/list_posts.tpl
+++ b/templates/list_posts.tpl
@@ -1,10 +1,10 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.7 2007/03/09 21:48:45 spiderr Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.8 2007/03/31 15:54:14 squareing Exp $ *}
 {strip}
 <div class="listing bitboard">
 
 <div class="navbar">
 	<div class="boards breadcrumb">
-		<a href="{$smarty.const.BITBOARDS_PKG_URL}">{tr}Message Boards{/tr}</a> &raquo; <a href="{$board->mInfo.display_url}">{$board->mInfo.title|escape}</a>
+		<a href="{$smarty.const.BOARDS_PKG_URL}">{tr}Message Boards{/tr}</a> &raquo; <a href="{$board->mInfo.display_url}">{$board->mInfo.title|escape}</a>
 	</div>
 </div>
 
@@ -33,7 +33,7 @@
 		{/form}
 		{assign var=flip value=$thread->getFlipFlop()}
 		{foreach from=$flip item=flip_s key=flip_name}
-			{include file="bitpackage:bitboards/flipswitch.tpl"}
+			{include file="bitpackage:boards/flipswitch.tpl"}
 		{/foreach}
 	</div>
 
@@ -55,7 +55,7 @@
 		{formfeedback hash=$formfeedback}
 
 		{foreach item=comment from=$comments}
-			<div class="mb-post {cycle values="even,odd"}{if $gBitSystem->isFeatureActive('bitboards_post_anon_moderation') && $comment.user_id<0 and $comment.is_approved==0} unapproved{/if}">
+			<div class="mb-post {cycle values="even,odd"}{if $gBitSystem->isFeatureActive('boards_post_anon_moderation') && $comment.user_id<0 and $comment.is_approved==0} unapproved{/if}">
 				{assign var=thread_mInfo value=$thread->mInfo}
 				{displaycomment comment=$comment template=$comment_template}
 			</div>
@@ -84,12 +84,12 @@
 	</div><!-- end .body -->
 </div><!-- end .bitboard -->
 
-{if $gBitSystem->isFeatureActive('bitboards_post_anon_moderation') && ($smarty.request.post_comment_request || !empty($smarty.request.post_comment_submit)) && !$gBitUser->isRegistered()}
+{if $gBitSystem->isFeatureActive('boards_post_anon_moderation') && ($smarty.request.post_comment_request || !empty($smarty.request.post_comment_submit)) && !$gBitUser->isRegistered()}
 	{formfeedback warning="Your post will not be shown immediately it will have to be approved by a moderator"}
 {/if}
 
 {include file="bitpackage:liberty/comments_post_inc.tpl"  post_title="Post" hide=1 preview_override=1}
 
-{include file="bitpackage:bitboards/legend_inc.tpl"  posticons=1}
+{include file="bitpackage:boards/legend_inc.tpl"  posticons=1}
 {/strip}
 
diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl
index c37e006..b0cebfd 100644
--- a/templates/list_topics.tpl
+++ b/templates/list_topics.tpl
@@ -1,13 +1,13 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.7 2007/02/16 22:38:20 nickpalmer Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.8 2007/03/31 15:54:14 squareing Exp $ *}
 {strip}
 <div class="listing bitboard">
 	<div class="floaticon">
 		{if $print_page ne 'y'}
 			{if $gBitUser->hasPermission( 'p_bitboard_edit' )}
-				<a title="{tr}Remove this message board{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}edit.php?b={$board->mInfo.board_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit Message Board"}</a>
+				<a title="{tr}Remove this message board{/tr}" href="{$smarty.const.BOARDS_PKG_URL}edit.php?b={$board->mInfo.board_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit Message Board"}</a>
 			{/if}
 			{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
-				<a title="{tr}Remove this message board{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}remove.php?b={$board->mInfo.board_id}">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove Message Board"}</a>
+				<a title="{tr}Remove this message board{/tr}" href="{$smarty.const.BOARDS_PKG_URL}remove.php?b={$board->mInfo.board_id}">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove Message Board"}</a>
 			{/if}
 		{/if}<!-- end print_page -->
 	</div><!-- end .floaticon -->
@@ -35,31 +35,31 @@
 			<input type="hidden" name="sort_mode" value="{$control.sort_mode|escape}" />
 
 			<table class="data">
-				{if !$gBitSystem->isFeatureActive('bitboards_thread_verbrose')}
+				{if !$gBitSystem->isFeatureActive('boards_thread_verbrose')}
 					<tr>
 						<th style="width:5%;"> </th>
 						<th style="width:40%;">{tr}Title{/tr}</th>
 						<th style="width:5%;">{tr}Replies{/tr}</th>
 						<th style="width:20%;">{tr}Started{/tr}</th>
 						<th style="width:20%;">{tr}Last Reply{/tr}</th>
-						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+						{if $gBitUser->hasPermission('p_boards_edit') || $gBitUser->hasPermission('p_boards_post_edit')}
 							<th style="width:1%;"><abbr title="{tr}Number of posts by Anonymous users{/tr}">Anon</abbr></th>
 						{/if}
-						{if $gBitUser->hasPermission('p_bitboards_edit')}
+						{if $gBitUser->hasPermission('p_boards_edit')}
 							<th style="width:10%;" colspan="2">Actions</th>
 						{/if}
 					</tr>
 				{/if}
 
 				{foreach item=thread from=$threadList}
-					<tr class="{cycle values="even,odd"} {if $gBitSystem->isFeatureActive('bitboards_post_anon_moderation') && $thread.unreg > 0}unapproved{elseif $thread.th_moved>0}moved{/if} {if $thread.th_sticky==1} highlight{/if}" >
+					<tr class="{cycle values="even,odd"} {if $gBitSystem->isFeatureActive('boards_post_anon_moderation') && $thread.unreg > 0}unapproved{elseif $thread.th_moved>0}moved{/if} {if $thread.th_sticky==1} highlight{/if}" >
 						<td style="white-space:nowrap;">{* topic status icons *}
 							{if $thread.th_moved>0}
 								{biticon ipackage="icons" iname="go-jump" iexplain="Moved Topic"}
 							{else}
 								{assign var=flip value=$thread.flip}
 								{foreach from=$flip item=flip_s key=flip_name}
-									{include file="bitpackage:bitboards/flipswitch.tpl"}
+									{include file="bitpackage:boards/flipswitch.tpl"}
 								{/foreach}
 							{/if}
 						</td>
@@ -80,27 +80,27 @@
 							{if $thread.post_count > 1}{if $thread.llc_user_id < 0}{$thread.l_anon_name|escape}{else}{displayname user_id=$thread.llc_user_id}{/if}{else}{/if}
 						</td>
 
-						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+						{if $gBitUser->hasPermission('p_boards_edit') || $gBitUser->hasPermission('p_boards_post_edit')}
 							<td style="text-align:center;">{if $thread.unreg > 0}<a class="highlight" href="{$thread.url}" title="{$thread.title|escape}">{$thread.unreg}</a>{/if}</td>
 						{/if}
 
-						{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
+						{if $gBitUser->hasPermission('p_boards_edit') || $gBitUser->hasPermission('p_boards_post_edit')}
 							<td class="actionicon">
 								{if $thread.flc_user_id<0 && $thread.first_approved==0}
-									<a title="{tr}Approve First Post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&amp;action=1&amp;comment_id={$thread.th_thread_id}">
+									<a title="{tr}Approve First Post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&amp;action=1&amp;comment_id={$thread.th_thread_id}">
 										{biticon ipackage="icons" iname="list-add" iexplain="Approve First Post" iforce="icon"}
 									</a>
-									<a title="{tr}Reject First Post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&amp;action=2&amp;comment_id={$thread.th_thread_id}">
+									<a title="{tr}Reject First Post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}topic.php?b={$board->mInfo.board_id}&amp;action=2&amp;comment_id={$thread.th_thread_id}">
 										{biticon ipackage="icons" iname="list-remove" iexplain="Reject First Post" iforce="icon"}
 									</a>
 								{/if}
 
 								{if $thread.th_moved==0}
-									{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
+									{if $gBitUser->hasPermission( 'p_boards_edit' )}
 										{*smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$thread.board_id*}
 										<a onclick="
 											document.getElementById('move_block_{$thread.th_thread_id|escape:"url"}').style['display']='inline';
-											var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=1&amp;seq=' + new Date().getTime();
+											var url = '{$smarty.const.BOARDS_PKG_URL}ajax.php?req=1&amp;seq=' + new Date().getTime();
 											var element = 'move_{$thread.th_thread_id|escape:"url"}';
 											var params = null;
 											{literal}
@@ -116,22 +116,22 @@
 												this.onclick=this.oldonclick;
 												return false;
 											');
-											return false;" title="{tr}Move Thread{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}"
+											return false;" title="{tr}Move Thread{/tr}" href="{$smarty.const.BOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}"
 										>{biticon ipackage=icons iname="go-jump" iexplain="Move Thread" iforce="icon"}</a>
 									{/if}
 								{/if}
 
-								{if $thread.th_moved==0 && $gBitUser->hasPermission( 'p_bitboards_remove' )}
-									<a title="{tr}Delete Thread{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}topic.php?remove=1&amp;thread_id={$thread.th_thread_id|escape:"url"}">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Thread" iforce="icon"}</a>
+								{if $thread.th_moved==0 && $gBitUser->hasPermission( 'p_boards_remove' )}
+									<a title="{tr}Delete Thread{/tr}" href="{$smarty.const.BOARDS_PKG_URL}topic.php?remove=1&amp;thread_id={$thread.th_thread_id|escape:"url"}">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Thread" iforce="icon"}</a>
 								{else}
 									{biticon ipackage=liberty iname=spacer iforce="icon"}
 								{/if}
 
 								{if $thread.th_moved==0}
-									{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
+									{if $gBitUser->hasPermission( 'p_boards_edit' )}
 										<br />
 										<div style="display:none;" id="move_block_{$thread.th_thread_id|escape:"url"}">
-											Move&nbsp;to:&nbsp;<select onchange="window.location=('{$smarty.const.BITBOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}&amp;target='+
+											Move&nbsp;to:&nbsp;<select onchange="window.location=('{$smarty.const.BOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}&amp;target='+
 												document.getElementById('move_{$thread.th_thread_id|escape:"url"}').value);" id="move_{$thread.th_thread_id|escape:"url"}">
 												<option></option>
 											</select>
@@ -140,7 +140,7 @@
 								{/if}
 							</td>
 
-							{if $thread.th_moved==0 && $gBitUser->hasPermission( 'p_bitboards_remove' )}
+							{if $thread.th_moved==0 && $gBitUser->hasPermission( 'p_boards_remove' )}
 								<td>
 									<input type="checkbox" name="checked[]" title="{$thread.title|escape}" value="{$thread.th_thread_id}" />
 								</td>
@@ -160,7 +160,7 @@
 				</div>
 			{/if}
 
-			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
+			{if $gBitUser->hasPermission( 'p_boards_remove' )}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
 						document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
@@ -169,8 +169,8 @@
 
 					<select name="submit_mult" onchange="this.form.submit();">
 						<option value="" selected="selected">{tr}with checked{/tr}:</option>
-						{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
-							<option value="remove_bitboards">{tr}remove{/tr}</option>
+						{if $gBitUser->hasPermission( 'p_boards_remove' )}
+							<option value="remove_boards">{tr}remove{/tr}</option>
 						{/if}
 					</select>
 
@@ -181,11 +181,11 @@
 
 		{pagination b=$smarty.request.b}
 
-		{include file="bitpackage:bitboards/legend_inc.tpl" topicicons=1}
+		{include file="bitpackage:boards/legend_inc.tpl" topicicons=1}
 	</div><!-- end .body -->
 </div><!-- end .admin -->
 
-{if $gBitSystem->isFeatureActive('bitboards_post_anon_moderation') && $smarty.request.post_comment_request && !$gBitUser->isRegistered()}
+{if $gBitSystem->isFeatureActive('boards_post_anon_moderation') && $smarty.request.post_comment_request && !$gBitUser->isRegistered()}
 	{formfeedback warning="Your post will not be shown immediately it will have to be approved by a moderator"}
 {/if}
 
diff --git a/templates/menu_bitboards.tpl b/templates/menu_bitboards.tpl
deleted file mode 100644
index 16e2983..0000000
--- a/templates/menu_bitboards.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{strip}
-	<ul>
-		{if $gBitUser->hasPermission( 'p_bitboards_read')}
-			<li><a class="item" href="{$smarty.const.BITBOARDS_PKG_URL}index.php">{tr}Boards Home{/tr}</a></li>
-		{/if}
-		{if $gBitUser->hasPermission( 'p_bitboards_edit')}
-			<li><a class="item" href="{$smarty.const.BITBOARDS_PKG_URL}edit.php">{tr}Create new Board{/tr}</a></li>
-			<li><a class="item" href="{$smarty.const.BITBOARDS_PKG_URL}assign.php">{tr}Assign content to Board{/tr}</a></li>
-		{/if}
-	</ul>
-{/strip}
diff --git a/templates/menu_bitboards_admin.tpl b/templates/menu_bitboards_admin.tpl
deleted file mode 100644
index cf2b3e4..0000000
--- a/templates/menu_bitboards_admin.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ul><li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=bitboards">{tr}BitBoard Settings{/tr}</a></li></ul>
diff --git a/templates/menu_boards.tpl b/templates/menu_boards.tpl
new file mode 100644
index 0000000..ec36501
--- /dev/null
+++ b/templates/menu_boards.tpl
@@ -0,0 +1,11 @@
+{strip}
+	<ul>
+		{if $gBitUser->hasPermission( 'p_boards_read')}
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}index.php">{tr}Boards Home{/tr}</a></li>
+		{/if}
+		{if $gBitUser->hasPermission( 'p_boards_edit')}
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}edit.php">{tr}Create new Board{/tr}</a></li>
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}assign.php">{tr}Assign content to Board{/tr}</a></li>
+		{/if}
+	</ul>
+{/strip}
diff --git a/templates/menu_boards_admin.tpl b/templates/menu_boards_admin.tpl
new file mode 100644
index 0000000..52cff48
--- /dev/null
+++ b/templates/menu_boards_admin.tpl
@@ -0,0 +1 @@
+<ul><li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=boards">{tr}BitBoard Settings{/tr}</a></li></ul>
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index b9c72b9..23b1475 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -33,13 +33,13 @@
 					{if $gBitUser->hasPermission( 'p_liberty_admin_comments' )}
 						<a href="{$comments_return_url}&amp;delete_comment_id={$comment.comment_id}" rel="nofollow">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove" iforce="icon"}</a>
 					{/if}
-					{if $gBitUser->hasPermission( 'p_bitboards_edit' ) && (($comment.user_id<0 && $comment.is_approved==0)||$comment.user_id>=0) && !$comment.is_warned}
+					{if $gBitUser->hasPermission( 'p_boards_edit' ) && (($comment.user_id<0 && $comment.is_approved==0)||$comment.user_id>=0) && !$comment.is_warned}
 						{if $comment.user_id<0 && $comment.is_approved==0}
-							<a title="{tr}Approve this post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=1&amp;comment_id={$comment.comment_id}">
+							<a title="{tr}Approve this post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=1&amp;comment_id={$comment.comment_id}">
 								{biticon ipackage="icons" iname="list-add" iexplain="Approve Post" iforce="icon"}
 							</a>
 
-							<a title="{tr}Reject this post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=2&amp;comment_id={$comment.comment_id}">
+							<a title="{tr}Reject this post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=2&amp;comment_id={$comment.comment_id}">
 								{biticon ipackage="icons" iname="list-remove" iexplain="Reject Post" iforce="icon"}
 							</a>
 						{elseif !$comment.is_warned && $comment.user_id>=0}
@@ -52,7 +52,7 @@
 										return false;
 									');
 									return false;
-								" title="{tr}Warn the poster about this post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=3&amp;comment_id={$comment.comment_id}"
+								" title="{tr}Warn the poster about this post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}post.php?t={$thread->mRootId}&amp;action=3&amp;comment_id={$comment.comment_id}"
 							>{biticon ipackage="icons" iname="dialog-warning" iexplain="Warn Post" iforce="icon"}</a>
 
 							<div style="display:none;" id="warn_block_{$comment.comment_id|escape:"url"}">
@@ -96,7 +96,7 @@
 				{assign var=comment_id value=$comment.comment_id}
 				<a onclick="
 					var e = document.getElementById('warned_message_{$comment.comment_id|escape:"url"}');
-					var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=10&comment_id={$comment_id}&amp;seq=' + new Date().getTime();
+					var url = '{$smarty.const.BOARDS_PKG_URL}ajax.php?req=10&comment_id={$comment_id}&amp;seq=' + new Date().getTime();
 					var element = 'warned_message_{$comment.comment_id|escape:"url"}';
 					var params = null;
 					{literal}