diff --git a/ajax/documentController.php b/ajax/documentController.php
index 34d73eeb..c10bbe93 100644
--- a/ajax/documentController.php
+++ b/ajax/documentController.php
@@ -112,7 +112,7 @@ class DocumentController extends Controller{
 		$sessions = $session->getCollectionBy('file_id', $fileIds);
 
 		$members = array();
-		$member = new Db_Member();
+		$member = new Db\Member();
 		foreach ($sessions as $session) {			
 			$members[$session['es_id']] = $member->getActiveCollection($session['es_id']);
 		}
diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index 476563c0..db2d8986 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -35,7 +35,7 @@ try{
 	$session->load($esId);
 	
 	$memberId = $request->getParam('args/member_id');
-	$member = new Db_Member();
+	$member = new Db\Member();
 	$member->load($memberId);
 	
 	if ($member->getIsGuest() || is_null($member->getIsGuest())){
diff --git a/ajax/sessionController.php b/ajax/sessionController.php
index ab5b9d40..f83736f6 100644
--- a/ajax/sessionController.php
+++ b/ajax/sessionController.php
@@ -71,7 +71,7 @@ class SessionController extends Controller{
 			}
 			
 			$memberId = @$_SERVER['HTTP_WEBODF_MEMBER_ID'];
-			$currentMember = new Db_Member();
+			$currentMember = new Db\Member();
 			$currentMember->load($memberId);
 			if (is_null($currentMember->getIsGuest()) || $currentMember->getIsGuest()){
 				self::preDispatchGuest();
@@ -119,7 +119,7 @@ class SessionController extends Controller{
 				}
 			}
 			
-			$member = new Db_Member();
+			$member = new Db\Member();
 			$members = $member->getActiveCollection($esId);
 			$memberIds = array_map(
 				function($x){
diff --git a/ajax/userController.php b/ajax/userController.php
index 8eca2fc8..c43186b6 100644
--- a/ajax/userController.php
+++ b/ajax/userController.php
@@ -26,10 +26,10 @@ class UserController extends Controller{
 	
 	protected static function disconnect($args){
 		$esId = @$_POST['esId'];
-		$member = new Db_Member();
+		$member = new Db\Member();
 		$member->loadBy('member_id', $args['member_id']);
 		if ($esId && $member->hasData()){
-			if ($member->getEsId() === $esId && $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE){
+			if ($member->getEsId() === $esId && $member->getStatus() == Db\Member::MEMBER_STATUS_ACTIVE){
 				$member->deactivate(array($args['member_id']));
 				$op = new Db\Op();
 				$op->removeMember($esId, $args['member_id']);
@@ -44,14 +44,14 @@ class UserController extends Controller{
 		
 		$memberId = Helper::getArrayValueByKey($args, 'member_id');
 		$name = Helper::getArrayValueByKey($_POST, 'name');
-		$member = new Db_Member();
+		$member = new Db\Member();
 		$member->load($memberId);
 
 		if ($member->getEsId()
-				&& $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE 
+				&& $member->getStatus() == Db\Member::MEMBER_STATUS_ACTIVE 
 				&& $member->getIsGuest()
 		){
-			$guestMark = Db_Member::getGuestPostfix();
+			$guestMark = Db\Member::getGuestPostfix();
 			if (substr($name, -strlen($guestMark)) !== $guestMark){
 				$name = $name . ' ' . $guestMark;
 			}
diff --git a/appinfo/app.php b/appinfo/app.php
index c0d26978..0e29d831 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -40,7 +40,6 @@ OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionContr
 OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.php';
 OC::$CLASSPATH['OCA\Documents\Download_Simple'] = 'documents/lib/download/simple.php';
 OC::$CLASSPATH['OCA\Documents\Download_Range'] = 'documents/lib/download/range.php';
-OC::$CLASSPATH['OCA\Documents\Db_Member'] = 'documents/lib/db/member.php';
 OC::$CLASSPATH['OCA\Documents\Filter_Office'] = 'documents/lib/filter/office.php';
 
 //Script for registering file actions
diff --git a/lib/db/member.php b/lib/db/member.php
index d70295ff..a7a75e0e 100644
--- a/lib/db/member.php
+++ b/lib/db/member.php
@@ -10,7 +10,7 @@
  * later.
  */
 
-namespace OCA\Documents;
+namespace OCA\Documents\Db;
 
 /**
  * @method boolean getIsGuest()
@@ -19,7 +19,7 @@ namespace OCA\Documents;
  * @method int getStatus()
  */
 
-class Db_Member extends Db{
+class Member extends \OCA\Documents\Db{
 
 	const DB_TABLE = '`*PREFIX*documents_member`';
 
diff --git a/lib/db/session.php b/lib/db/session.php
index 2dab139d..7c8aefdf 100644
--- a/lib/db/session.php
+++ b/lib/db/session.php
@@ -70,7 +70,7 @@ class Session extends \OCA\Documents\Db {
 		;
 		
 		$memberColor = \OCA\Documents\Helper::getMemberColor($uid);
-		$member = new \OCA\Documents\Db_Member(array(
+		$member = new \OCA\Documents\Db\Member(array(
 			$sessionData['es_id'], 
 			$uid,
 			$memberColor,
@@ -87,7 +87,7 @@ class Session extends \OCA\Documents\Db {
 				$imageUrl = $uid;
 			}
 
-			$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db_Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
+			$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
 			
 			$sessionData['member_id'] = (string) $member->getLastInsertId();
 			$op = new \OCA\Documents\Db\Op();
@@ -112,7 +112,7 @@ class Session extends \OCA\Documents\Db {
 		$session = new Session();
 		$session->deleteBy('es_id', $esId);
 		
-		$member = new \OCA\Documents\Db_Member();
+		$member = new \OCA\Documents\Db\Member();
 		$member->deleteBy('es_id', $esId);
 		
 		$op= new \OCA\Documents\Db\Op();
@@ -139,7 +139,7 @@ class Session extends \OCA\Documents\Db {
 			SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
 			FROM ' . $this->tableName . ' AS `s`
 			LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
-				AND `m`.`status`=' . Db_Member::MEMBER_STATUS_ACTIVE . '
+				AND `m`.`status`=' . Db\Member::MEMBER_STATUS_ACTIVE . '
 				AND `m`.`uid` != ?
 			WHERE `s`.`es_id` = ?
 			GROUP BY `m`.`es_id`
@@ -168,7 +168,7 @@ class Session extends \OCA\Documents\Db {
 			SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
 			FROM ' . $this->tableName . ' AS `s`
 			LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
-				AND `m`.`status`=' . Db_Member::MEMBER_STATUS_ACTIVE . '
+				AND `m`.`status`=' . Db\Member::MEMBER_STATUS_ACTIVE . '
 			WHERE `s`.`file_id` ' . $stmt .'
 			GROUP BY `m`.`es_id`',
 			$fileIds
diff --git a/lib/storage.php b/lib/storage.php
index 20c968fd..0c165d48 100644
--- a/lib/storage.php
+++ b/lib/storage.php
@@ -78,10 +78,10 @@ class Storage {
 			return;
 		}
 		
-		$member = new Db_Member();
+		$member = new Db\Member();
 		$sessionMembers = $member->getCollectionBy('es_id', $session->getEsId());
 		foreach ($sessionMembers as $memberData){
-			if (intval($memberData['status'])===Db_Member::MEMBER_STATUS_ACTIVE){
+			if (intval($memberData['status'])===Db\Member::MEMBER_STATUS_ACTIVE){
 				return;
 			}
 		}
diff --git a/public.php b/public.php
index bdfbea8f..91ea50f7 100644
--- a/public.php
+++ b/public.php
@@ -43,7 +43,7 @@ if (isset($_GET['t'])) {
 				$session->loadBy('file_id', $file->getFileId());
 				
 				if ($session->getEsId()){
-					$member = new Db_Member();
+					$member = new Db\Member();
 					$members = $member->getCollectionBy('es_id', $session->getEsId());
 				} else {
 					$members = 0;