diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
index 9606b66..c349b81 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
@@ -1,17 +1,34 @@
 <?php
 /**
-* BL information for adding a Org
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add an organisation
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
 require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
 require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
index f0e32cb..e23de59 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information when adding a Org is successful
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Add an organisation success page.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
index 8f48b7e..d1080e5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a Org
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add an organisation UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 // get add pages
 function getPage() {
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
index dd9bfba..a5594c6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for editing a Org
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit organisation.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
 	require_once("editOrgUI.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
+	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 	require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
 	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
index e2fb287..e3c76aa 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
@@ -1,13 +1,30 @@
 <?php
 /**
-* Presentation information for renaming a Org
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit organisation UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
+ 
 // if its the manual edit page..then display normally
 function getEditPage($iOrgID) {	
 	global $default;
@@ -80,7 +97,7 @@ function getEditPageFail() {
 function getOrgDisplay($oOrg) {
 	global $default;
 	if (!isset($oOrg)) {
-		$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+		$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 		//$oPatternListBox->setIncludeDefaultValue(true);
 		$oPatternListBox->setPostBackOnChange(true);		
 		return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php
index d90f4fb..0213418 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List organisations.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/users/User.inc");    
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");    
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc
index c7c7643..b455382 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List organisations UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 
 function getOrganisations() {
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
index 4aceec1..5aede7b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for adding a Org
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove organisation.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("removeOrgUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
index 87a9fd0..f72f7e7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
@@ -1,13 +1,30 @@
 <?php
-
 /**
-* Presentation information for Deleting a Org 
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove organisation UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.orgmanagement
+ */
+ 
 // gets the delete stuff
 function getDeletePage($iOrgID) {
     global $default;
@@ -87,7 +104,7 @@ function getDeleteFailPage() {
 function getOrgDisplay($oOrg) {
     global $default;
     if (!isset($oOrg)) {
-        $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+        $oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
         $oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php
index b9735e1..f1e18b4 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for adding a new role
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a role.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc
index d0c6103..4308ab3 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a group
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a role UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 // get add pages
 function getPage() {
 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleBL.php
index 4c6d720..c7fb379 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for editing a role's properties
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit a role.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("editRoleUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/roles/Role.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php
index 2e29fe6..dcf214a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information when updating group properties is successful
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit a role success page.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
index cbdd36b..8b58ec7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
@@ -1,18 +1,35 @@
 <?php
 /**
-* Presentation information for adding a group
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit a role UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 // get hte edit page if it comes from the add page
 function getCreatePage($iRoleID) {
 	
 	global $default;
 	
-	$sQuery =  "SELECT * FROM $default->owl_roles_table WHERE id = $iRoleID";
+	$sQuery =  "SELECT * FROM $default->roles_table WHERE id = $iRoleID";
 	$aDisplayColumns = array("name","active","can_read","can_write");
 	$aStoreColumns = array("name","active", "can_read","can_write");
 	$aColumnNames = array("Name:","Active:", "Readable:", "Writable:");
@@ -20,7 +37,7 @@ function getCreatePage($iRoleID) {
 	$aDatabaseColumnTypes = array(1,2,2,2);
 	
 	// get list of role properties...name...text field...is_Sys_admin and is_unit_admin..checkboxes
-	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->owl_roles_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
+	$oPattern = & new PatternEditableListFromQuery($sQuery, $default->roles_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes) ;
 	$oPattern->setUniqueName("roleEdit");
 	$oPattern->setColumnsRequired(array(1,0,0,0));
 		
@@ -159,7 +176,7 @@ function getEditPageFail() {
 function getRoleDisplay($oRole) {
 	global $default;
 	if (!isset($oRole)) {
-		$oPatternListBox = & new PatternListBox($default->owl_roles_table, "name", "id", "fRoleID");
+		$oPatternListBox = & new PatternListBox($default->roles_table, "name", "id", "fRoleID");
 		//$oPatternListBox->setIncludeDefaultValue(true);
 		$oPatternListBox->setPostBackOnChange(true);		
 		return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php
index d87cabd..15d833c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesBL.php
@@ -1,16 +1,33 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List roles.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/users/User.inc");    
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");    
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
index 51f58d7..8327630 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/listRolesUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * List roles UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 function getRoles() {
 	global $default;
 	$sQuery = 	"SELECT id as roleID, name as name, active, can_read as reader, can_write as writer, " . 
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleBL.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleBL.php
index 12f8f93..1f2f324 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for adding a Role
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a role.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("removeRoleUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/roles/Role.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc
index 54c5c6c..36d415a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc
@@ -1,13 +1,29 @@
 <?php
-
 /**
-* Presentation information for Deleting a Role 
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a role UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.rolemanagement
+ */
 // gets the delete stuff
 function getDeletePage($iRoleID) {
     global $default;
@@ -94,7 +110,7 @@ function getDeleteFailPage() {
 function getRoleDisplay($oRole) {
     global $default;
     if (!isset($oRole)) {
-        $oPatternListBox = & new PatternListBox($default->owl_roles_table, "name", "id", "fRoleID");
+        $oPatternListBox = & new PatternListBox($default->roles_table, "name", "id", "fRoleID");
         $oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsBL.php
index 03667c1..639a06a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for changing system info
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit system settings.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.systemsettings
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("systemSettingsUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/System.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
index 8bc3704..1ac5650 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
@@ -1,13 +1,29 @@
 <?php
-
 /**
-* Presentation information for changing system info
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit system settings UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.systemsettings
+ */
 // gets the delete stuff
 function getPage() {
     global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
index ad5c38a..968c5c5 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
@@ -1,18 +1,35 @@
 <?php
 /**
-* BL information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a unit.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
 require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
 require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
 require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php
index 6a0b732..d8a64ba 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgBL.php
@@ -1,12 +1,29 @@
 <?php
 /**
-* BL information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Map unit to organisation.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,7 +33,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
     require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc
index 262d033..0fcd965 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitToOrgUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Map a unit to an organisation UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 
 function getAddFailPage(){
 	global $default;
@@ -78,7 +95,7 @@ function getAddUnitsPage($oUnit) {
 function getOrgDropdown(){
 	global $default;
 	
-	$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+	$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 	$sToRender .= $oPatternListBox->render();
 	
 	return $sToRender;
@@ -194,7 +211,7 @@ function getAddPageToOrgFail() {
 function getOrgDisplay($oOrg) {
 	global $default;
 	if (!isset($oOrg)) {
-		$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+		$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 		return $oPatternListBox->render();
 	} else {
 		return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
index 6f99395..e6636a2 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
@@ -1,12 +1,30 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Add a unit UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
+ 
 // get add pages
 function getAddPage() {
 	global $default;
@@ -116,7 +134,7 @@ function getAddPageToOrgFail() {
  */
 function getOrgDisplay() {
 	global $default;
-	$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+	$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 	return $oPatternListBox->render();
 }
 ?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php
index 52f8b86..9ea0a28 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php
@@ -1,19 +1,36 @@
 <?php
 /**
-* BL information for editing a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit a unit.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("editUnitUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php
index 7a36b79..c6919fc 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgBL.php
@@ -1,12 +1,30 @@
 <?php
 /**
-* BL information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit unit-organisation mapping.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
+ 
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -15,7 +33,7 @@ if (checkSession()) {
     require_once("editUnitOrgUI.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
     require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc
index c4a90f6..534c9b7 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitOrgUI.inc
@@ -1,12 +1,29 @@
 <?php
 /**
-* Presentation information for adding a User
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Edit unit-organisation mapping UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 
 function getOrgPage($fUnitID = null){
 	global $default;
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc
index 4721f31..74cbb24 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for renaming a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Edit unit UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 // if its the manual edit page..then display normally
 function getEditPage($iUnitID) {	
 	global $default;
@@ -77,7 +93,7 @@ function getEditPageFail() {
 function getUnitDisplay($oUnit) {
 	global $default;
 	if (!isset($oUnit)) {
-		$oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
+		$oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID");
 		$oPatternListBox->setPostBackOnChange(true);		
 		return $oPatternListBox->render();
 	} else {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php
index 4ad43d3..47d5011 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php
@@ -1,16 +1,32 @@
 <?php
 /**
-* BL information for viewing a Discussion	
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * List units.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 require_once("../../../../../config/dmsDefaults.php");
 require_once("$default->fileSystemRoot/lib/users/User.inc");    
-require_once("$default->fileSystemRoot/lib/security/permission.inc");
+require_once("$default->fileSystemRoot/lib/security/Permission.inc");
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");    
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");    
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc
index 4bf87fd..d553fb9 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc
@@ -1,16 +1,32 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Omar Rahbeeni
-* @date 19 May 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * List units UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 function getOrganisationDisplay($fOrganisationID) {
 	global $default;
-	$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrganisationID");
+	$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrganisationID");
 	$oPatternListBox->setPostBackOnChange(true);
 	if ($fOrganisationID != 0) {
 		$oPatternListBox->setSelectedValue($fOrganisationID);
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
index 2594919..1b43c9a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
@@ -1,19 +1,37 @@
 <?php
 /**
-* BL information for adding a Unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a unit.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
+
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
     require_once("removeUnitUI.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php
index c2aa48f..ca8f884 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgBL.php
@@ -1,12 +1,30 @@
 <?php
 /**
-* BL information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove unit-organisation mapping.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
+ 
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
@@ -16,7 +34,7 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
     require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
     require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
-    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/lib/security/Permission.inc");
     require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
     require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
     require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc
index 8e593c5..1092103 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitFromOrgUI.inc
@@ -1,13 +1,29 @@
 <?php
 /**
-* Presentation information for adding a unit
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
-
+ * $Id$
+ *
+ * Remove unit-organisation mapping UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 function getRemoveFailPage(){
 	global $default;
 	
@@ -87,7 +103,7 @@ function getRemoveUnitsPage($oLink) {
 function getOrgDropdown(){
 	global $default;
 	
-	$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+	$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 	$sToRender .= $oPatternListBox->render();
 	
 	return $sToRender;
@@ -203,7 +219,7 @@ function getAddPageToOrgFail() {
 function getOrgDisplay($oOrg) {
 	global $default;
 	if (!isset($oOrg)) {
-		$oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+		$oPatternListBox = & new PatternListBox($default->organisations_table, "name", "id", "fOrgID");
 		return $oPatternListBox->render();
 	} else {
 		return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
index 1a9782c..07a5861 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
@@ -1,13 +1,29 @@
 <?php
-
 /**
-* Presentation information for Deleting a Unit 
-*
-* @author Mukhtar Dharsey
-* @date 5 February 2003
-* @package presentation.lookAndFeel.knowledgeTree.
-*
-*/
+ * $Id$
+ *
+ * Remove a unit UI functions.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package administration.unitmanagement
+ */
 
 function getConfirmDeletePage($oUnit, $oOrg) {
     global $default;
@@ -53,7 +69,7 @@ function getStatusPage($sHeading, $sText = "") {
 function getUnitDisplay($oUnit) {
     global $default;
     if (!isset($oUnit)) {
-        $oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
+        $oPatternListBox = & new PatternListBox($default->units_table, "name", "id", "fUnitID");
         $oPatternListBox->setIncludeDefaultValue(true);
         $oPatternListBox->setPostBackOnChange(true);
         return $oPatternListBox->render();