diff --git a/lib/Db/NoteTagMapper.php b/lib/Db/NoteTagMapper.php
index 1615320..1bb25e5 100644
--- a/lib/Db/NoteTagMapper.php
+++ b/lib/Db/NoteTagMapper.php
@@ -21,8 +21,8 @@ class NoteTagMapper extends QBMapper {
 			->from($this->getTableName())
 			->where(
 				$qb->expr()->eq('user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
-				$qb->expr()->eq('note_id', $qb->createNamedParameter($note_id, IQueryBuilder::PARAM_INT)),
-				$qb->expr()->eq('tag_id', $qb->createNamedParameter($tag_id, IQueryBuilder::PARAM_INT))
+				$qb->expr()->eq('note_id', $qb->createNamedParameter($noteId, IQueryBuilder::PARAM_INT)),
+				$qb->expr()->eq('tag_id', $qb->createNamedParameter($tagId, IQueryBuilder::PARAM_INT))
 			);
 		return $this->findEntity($qb);
 	}
diff --git a/lib/Db/TagMapper.php b/lib/Db/TagMapper.php
index a2a3715..29dc15e 100644
--- a/lib/Db/TagMapper.php
+++ b/lib/Db/TagMapper.php
@@ -32,7 +32,7 @@ class TagMapper extends QBMapper {
 			->from($this->getTableName())
 			->where(
 				$qb->expr()->eq('user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)),
-				$qb->expr()->eq('name', $qb->createNamedParameter($id, IQueryBuilder::PARAM_STR))
+				$qb->expr()->eq('name', $qb->createNamedParameter($name, IQueryBuilder::PARAM_STR))
 			);
 		return $this->findEntity($qb);
 	}