diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
index 5ddde98c35868325d4797b7fd566fee4e8451651..4bb28c65ddd838de86461f6ff21663be5ab8813d 100644
--- a/lib/private/connector/sabre/principal.php
+++ b/lib/private/connector/sabre/principal.php
@@ -9,15 +9,21 @@
  * See the COPYING-README file.
  */
 
+namespace OC\Connector\Sabre;
+
 use OCP\IUserManager;
 use OCP\IConfig;
 
-class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\BackendInterface {
+class Principal implements \Sabre\DAVACL\PrincipalBackend\BackendInterface {
 	/** @var IConfig */
 	private $config;
 	/** @var IUserManager */
 	private $userManager;
 
+	/**
+	 * @param IConfig $config
+	 * @param IUserManager $userManager
+	 */
 	public function __construct(IConfig $config,
 								IUserManager $userManager) {
 		$this->config = $config;
@@ -45,7 +51,7 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 
 				$principal = [
 					'uri' => 'principals/' . $user->getUID(),
-					'{DAV:}displayname' => $user->getUID()
+					'{DAV:}displayname' => $user->getUID(),
 				];
 
 				$email = $this->config->getUserValue($user->getUID(), 'settings', 'email');
@@ -149,10 +155,20 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 		throw new \Sabre\DAV\Exception('Setting members of the group is not supported yet');
 	}
 
+	/**
+	 * @param string $path
+	 * @param array $mutations
+	 * @return int
+	 */
 	function updatePrincipal($path, $mutations) {
 		return 0;
 	}
 
+	/**
+	 * @param string $prefixPath
+	 * @param array $searchProperties
+	 * @return array
+	 */
 	function searchPrincipals($prefixPath, array $searchProperties) {
 		return [];
 	}
diff --git a/tests/lib/connector/sabre/principal.php b/tests/lib/connector/sabre/principal.php
index 77edf0113ba3b6385d4810442a077ff92d47b400..91e74dae047998128f064db0c8ec2fcf302263ff 100644
--- a/tests/lib/connector/sabre/principal.php
+++ b/tests/lib/connector/sabre/principal.php
@@ -8,15 +8,17 @@
  * See the COPYING-README file.
  */
 
+namespace OC\Connector\Sabre;
+
 use OCP\IUserManager;
 use OCP\IConfig;
 
-class Test_OC_Connector_Sabre_Principal extends \Test\TestCase {
+class Test_Principal extends \Test\TestCase {
 	/** @var IUserManager */
 	private $userManager;
 	/** @var IConfig */
 	private $config;
-	/** @var OC_Connector_Sabre_Principal */
+	/** @var Principal */
 	private $connector;
 
 	public function setUp() {
@@ -25,7 +27,7 @@ class Test_OC_Connector_Sabre_Principal extends \Test\TestCase {
 		$this->config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
 
-		$this->connector = new OC_Connector_Sabre_Principal($this->config, $this->userManager);
+		$this->connector = new Principal($this->config, $this->userManager);
 		parent::setUp();
 	}