diff --git a/lib/private/tagging/tag.php b/lib/private/tagging/tag.php
index d0cd6bbb966a50955a1145b9625ed50a1d9708ed..3ea9fbac20ba25e7dfa6775f9645ae37bf9e9c7b 100644
--- a/lib/private/tagging/tag.php
+++ b/lib/private/tagging/tag.php
@@ -55,8 +55,11 @@ class Tag extends Entity {
 
 	/**
 	 * Transform a database columnname to a property
+	 *
 	 * @param string $columnName the name of the column
 	 * @return string the property name
+	 * @todo migrate existing database columns to the correct names
+	 * to be able to drop this direct mapping
 	 */
 	public function columnToProperty($columnName){
 		if ($columnName === 'category') {
@@ -70,6 +73,7 @@ class Tag extends Entity {
 
 	/**
 	 * Transform a property to a database column name
+	 *
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
diff --git a/lib/private/tagging/tagmapper.php b/lib/private/tagging/tagmapper.php
index b5929e2618c3b10bb0485fa7a840a8859a13af1d..6c9bec7aa52096abbfa046068e3febe1fb34f38d 100644
--- a/lib/private/tagging/tagmapper.php
+++ b/lib/private/tagging/tagmapper.php
@@ -27,7 +27,7 @@ use \OCP\AppFramework\Db\Mapper,
     \OCP\IDb;
 
 /**
- * Thin wrapper around \OCP\AppFramework\Db\Mapper.
+ * Mapper for Tag entity
  */
 class TagMapper extends Mapper {
 
diff --git a/lib/private/tags.php b/lib/private/tags.php
index 1065ba2ef98ee2fb83c55e3977a440cdb0feae85..bab3d4952825b08c1c08c8d86ea3b5cc3125dd61 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -324,7 +324,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Rename tag.
 	*
-	* @param string $from The name of the existing tag
+	* @param string|integer $from The name or ID of the existing tag
 	* @param string $to The new name of the tag.
 	* @return bool
 	*/
@@ -639,7 +639,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Delete tags from the database.
 	*
-	* @param string[] $names An array of tags (names or IDs) to delete
+	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names) {
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 2b09dcb5685f68ca6527f24a44ae545ef82136f3..4514746bbe88d56cc56b16280718118cb273265a 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -114,7 +114,7 @@ interface ITags {
 	/**
 	* Rename tag.
 	*
-	* @param string $from The name of the existing tag
+	* @param string|integer $from The name or ID of the existing tag
 	* @param string $to The new name of the tag.
 	* @return bool
 	*/
@@ -183,7 +183,7 @@ interface ITags {
 	/**
 	* Delete tags from the database
 	*
-	* @param string[] $names An array of tags to delete
+	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names);