diff --git a/database_tuneup.sql b/cernbox_utils/database_tuneup.sql
similarity index 100%
rename from database_tuneup.sql
rename to cernbox_utils/database_tuneup.sql
diff --git a/db_structure.xml b/db_structure.xml
index c55eaad66d0d..e99e667e8247 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1270,7 +1270,7 @@
 	</table>
 	
 	<table>
-		<name>ldap_users</name>
+		<name>cernbox_ldap_users</name>
 		<declaration>
 			<field>
 				<name>cn</name>
@@ -1318,7 +1318,7 @@
 	</table>
 	
 	<table>
-		<name>ldap_groups</name>
+		<name>cernbox_ldap_groups</name>
 		<declaration>
 			<field>
 				<name>cn</name>
@@ -1339,38 +1339,7 @@
 	</table>
 	
 	<table>
-		<name>ldap_group_members</name>
-		<declaration>
-			<field>
-				<name>user_cn</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>50</length>
-			</field>
-			<field>
-				<name>group_cn</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>100</length>
-			</field>
-			<index>
-				<primary>true</primary>
-				<unique>true</unique>
-				<name>group_members_index</name>
-				<field>
-					<name>user_cn</name>
-				</field>
-				<field>
-					<name>group_cn</name>
-				</field>
-			</index>			
-		</declaration>
-	</table>
-
-	<table>
-		<name>ldap_group_members</name>
+		<name>cernbox_ldap_group_members</name>
 		<declaration>
 			<field>
 				<name>user_cn</name>
@@ -1399,4 +1368,5 @@
 			</index>			
 		</declaration>
 	</table>
+	
 </database>
diff --git a/lib/ldapupdatecron.php b/lib/ldapupdatecron.php
index 7480943a17eb..5896ae195bd4 100644
--- a/lib/ldapupdatecron.php
+++ b/lib/ldapupdatecron.php
@@ -252,7 +252,7 @@ function insertIntoDatabase($table, $sql, $useLoadData = false)
 
 		//cronlog('Inserting groups into database...');
 
-		insertIntoDatabase('ldap_groups', buildQuery('ldap_groups', 's', ['cn'], $ldapGroups));
+		insertIntoDatabase('cernbox_ldap_groups', buildQuery('cernbox_ldap_groups', 's', ['cn'], $ldapGroups));
 		unset($ldapGroups);
 
 		//cronlog('Done');
@@ -281,13 +281,13 @@ function insertIntoDatabase($table, $sql, $useLoadData = false)
 
 		//cronlog('Inserting users into database...');
 
-		insertIntoDatabase('ldap_users', buildQuery('ldap_users', 'siss', ['cn','uidnumber','displayname','employeetype'], $ldapUsers));
+		insertIntoDatabase('cernbox_ldap_users', buildQuery('cernbox_ldap_users', 'siss', ['cn','uidnumber','displayname','employeetype'], $ldapUsers));
 		unset($ldapUsers);
 
 		//cronlog('Done');
 		//cronlog('Inserting users <-> groups into database...');
 	
-		insertIntoDatabase('ldap_group_members', buildCVSFile('ss', ['user_cn','group_cn'], $userGroups), true);
+		insertIntoDatabase('cernbox_ldap_group_members', buildCVSFile('ss', ['user_cn','group_cn'], $userGroups), true);
 		unset($userGroups);
 				
 		cronlog('Done');
diff --git a/lib/private/cache/ldapdatabase.php b/lib/private/cache/ldapdatabase.php
index a6355f1f38f2..04589010725d 100644
--- a/lib/private/cache/ldapdatabase.php
+++ b/lib/private/cache/ldapdatabase.php
@@ -3,9 +3,9 @@
 
 class LDAPDatabase
 {
-	const GROUPS_TABLE = 'ldap_groups';
-	const USERS_TABLE = 'ldap_users';
-	const GROUP_MAPPINGS = 'ldap_group_members';
+	const GROUPS_TABLE = 'cernbox_ldap_groups';
+	const USERS_TABLE = 'cernbox_ldap_users';
+	const GROUP_MAPPINGS = 'cernbox_ldap_group_members';
 	
 	/**
 	 *