diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 5c0cc9d22..29b367db7 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -32,6 +32,8 @@ use OCP\IGroup;
 
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\IURLGenerator;
+use OCP\INavigationManager;
 
 class Application extends App {
 
@@ -87,8 +89,8 @@ class Application extends App {
 
 	public function registerNavigationEntry() {
 		$container = $this->getContainer();
-		$container->query('OCP\INavigationManager')->add(function() use ($container) {
-			$urlGenerator = $container->query('OCP\IURLGenerator');
+		$container->query(INavigationManager::class)->add(function() use ($container) {
+			$urlGenerator = $container->query(IURLGenerator::class);
 			return [
 				'id' => 'deck',
 				'order' => 10,
diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php
index 2edc5d497..8ec8239d3 100644
--- a/lib/Db/AclMapper.php
+++ b/lib/Db/AclMapper.php
@@ -28,7 +28,7 @@ use OCP\IDBConnection;
 class AclMapper extends DeckMapper implements IPermissionMapper {
 
 	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl');
+		parent::__construct($db, 'deck_board_acl', Acl::class);
 	}
 
 	public function findAll($boardId, $limit = null, $offset = null) {
diff --git a/lib/Db/Board.php b/lib/Db/Board.php
index 3447b82e1..7a657c9e8 100644
--- a/lib/Db/Board.php
+++ b/lib/Db/Board.php
@@ -56,12 +56,18 @@ class Board extends RelationalEntity {
 		return $json;
 	}
 
+	/**
+	 * @param Label[] $labels
+	 */
 	public function setLabels($labels) {
 		foreach ($labels as $l) {
 			$this->labels[] = $l;
 		}
 	}
 
+	/**
+	 * @param Acl[] $acl
+	 */
 	public function setAcl($acl) {
 		foreach ($acl as $a) {
 			$this->acl[$a->id] = $a;
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index fad091488..77f5c6b8a 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -44,7 +44,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 		IUserManager $userManager,
 		IGroupManager $groupManager
 	) {
-		parent::__construct($db, 'deck_boards', '\OCA\Deck\Db\Board');
+		parent::__construct($db, 'deck_boards', Board::class);
 		$this->labelMapper = $labelMapper;
 		$this->aclMapper = $aclMapper;
 		$this->stackMapper = $stackMapper;
diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php
index 22e17bc56..b8f6e3f94 100644
--- a/lib/Db/CardMapper.php
+++ b/lib/Db/CardMapper.php
@@ -46,7 +46,7 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
 		IManager $notificationManager,
 		$databaseType
 	) {
-		parent::__construct($db, 'deck_cards', '\OCA\Deck\Db\Card');
+		parent::__construct($db, 'deck_cards', Card::class);
 		$this->labelMapper = $labelMapper;
 		$this->userManager = $userManager;
 		$this->notificationManager = $notificationManager;
diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php
index 206507b41..9ed47266b 100644
--- a/lib/Db/LabelMapper.php
+++ b/lib/Db/LabelMapper.php
@@ -29,7 +29,7 @@ use OCP\IDBConnection;
 class LabelMapper extends DeckMapper implements IPermissionMapper {
 
 	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
+		parent::__construct($db, 'deck_labels', Label::class);
 	}
 
 	public function findAll($boardId, $limit = null, $offset = null) {
diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php
index 526438459..51d8bf29c 100644
--- a/lib/Db/StackMapper.php
+++ b/lib/Db/StackMapper.php
@@ -32,7 +32,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	private $cardMapper;
 
 	public function __construct(IDBConnection $db, CardMapper $cardMapper) {
-		parent::__construct($db, 'deck_stacks', '\OCA\Deck\Db\Stack');
+		parent::__construct($db, 'deck_stacks', Stack::class);
 		$this->cardMapper = $cardMapper;
 	}