diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 7eeca9199fe78885306c76c10e7206a50ce85d63..0447202072852c0b02bbda4ef8902a404d8b60a4 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -21,15 +21,13 @@
  *
  */
 
-use OC\Connector\Sabre\TagList;
-
 class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
 
 	/**
 	 * Cached directory content
 	 *
-	 * @var \OCP\FileInfo[]
+	 * @var \OCP\Files\FileInfo[]
 	 */
 	private $dirContent;
 
diff --git a/lib/private/connector/sabre/taglist.php b/lib/private/connector/sabre/taglist.php
index 2b61be3e49298805ebee0f4005adc2b9ed2a6600..56cab393feae10283d49fc3761c4cc34d4617775 100644
--- a/lib/private/connector/sabre/taglist.php
+++ b/lib/private/connector/sabre/taglist.php
@@ -85,7 +85,7 @@ class TagList extends DAV\Property {
      * It will only decode tag values.
      *
      * @param \DOMElement $dom
-     * @return DAV\Property\TagList
+     * @return \OC\Connector\Sabre\TagList
      */
     static function unserialize(\DOMElement $dom) {
 
diff --git a/lib/private/connector/sabre/tagsplugin.php b/lib/private/connector/sabre/tagsplugin.php
index 86a66f5a8b59f71c6b335e552b31bcd7c0a759bd..dd0b5172bd6a86955432cf63e8bc026ee99a8255 100644
--- a/lib/private/connector/sabre/tagsplugin.php
+++ b/lib/private/connector/sabre/tagsplugin.php
@@ -28,8 +28,8 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin
 
 	// namespace
 	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{' . self::NS_OWNCLOUD . '}tags';
-	const FAVORITE_PROPERTYNAME = '{' . self::NS_OWNCLOUD . '}favorite';
+	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
 	const TAG_FAVORITE = '_$!<Favorite>!$_';
 
 	/**