diff --git a/lib/security/Permission.inc b/lib/security/Permission.inc
index 874c427..3039b05 100644
--- a/lib/security/Permission.inc
+++ b/lib/security/Permission.inc
@@ -165,7 +165,7 @@ class Permission {
         }       
         $sql = $default->db;
         $sQuery = "SELECT GFL.folder_id " .
-                        "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " .
+                        "FROM $default->groups_folders_table AS GFL INNER JOIN $default->users_groups_table AS UGL ON GFL.group_id = UGL.group_id " .
                         "WHERE UGL.user_id =  " . $_SESSION["userID"] . " " .
                         "AND GFL.can_write = 1 ";
         if ($oFolder->getInheritParentPermission()) {
@@ -225,7 +225,7 @@ class Permission {
         }
         
         $sQuery = "SELECT GFL.folder_id " .
-                  "FROM groups_folders_link AS GFL INNER JOIN users_groups_link AS UGL ON GFL.group_id = UGL.group_id " .
+                  "FROM $default->groups_folders_table AS GFL INNER JOIN $default->users_groups_table AS UGL ON GFL.group_id = UGL.group_id " .
                   "WHERE UGL.user_id =  " . $_SESSION["userID"] . " " .
                   "AND GFL.can_read = 1 ";
         if ($oFolder->getInheritParentPermission()) {
@@ -480,4 +480,4 @@ class Permission {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/createDependantDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/createDependantDocumentUI.inc
index c6a41b8..798f881 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/createDependantDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/createDependantDocumentUI.inc
@@ -75,7 +75,7 @@ function getUserDropDown($iUnitID, $iUserID) {
 		$iUnitID = -1;		
 	}
 	$oPatternListBox = & new PatternListBox($default->users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
-	$sFromClause = "INNER join users_groups_link AS UGL ON UGL.user_id = ST.id " .
+	$sFromClause = "INNER join $default->users_groups_table AS UGL ON UGL.user_id = ST.id " .
 					"INNER JOIN groups_units_link AS GUL ON GUL.group_id = UGL.group_id ";
 	$oPatternListBox->setFromClause($sFromClause);
 	if (isset($iUserID)) {
@@ -119,4 +119,4 @@ function getBrowseJavaScript() {
     $sToRender .= "//--></script>\n";	
     return $sToRender;
 }
-?>
\ No newline at end of file
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
index 7de69f4..a8c9d45 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc
@@ -153,7 +153,7 @@ function getAddPage($iFolderCollaborationID, $iFolderID, $iUnitID, $sDocumentTit
 function getUserDropDown($iUnitID, $iUserID = null) {
 	global $default;	
 	$oPatternListBox = & new PatternListBox($default->users_table, "Name", "id", "fUserID", "GUL.unit_id = $iUnitID");
-	$sFromClause = "INNER join users_groups_link AS UGL ON UGL.user_id = ST.id " .
+	$sFromClause = "INNER join $default->users_groups_table AS UGL ON UGL.user_id = ST.id " .
 					"INNER JOIN groups_units_link AS GUL ON GUL.group_id = UGL.group_id ";
 	$oPatternListBox->setFromClause($sFromClause);
 	if (isset($iUserID)) {
@@ -194,4 +194,4 @@ function getBrowseJavaScript() {
     $sToRender .= "//--></script>\n";	
     return $sToRender;
 }
-?>
\ No newline at end of file
+?>