diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php
index 9b78dd211..5791307c6 100644
--- a/lib/Db/AclMapper.php
+++ b/lib/Db/AclMapper.php
@@ -23,9 +23,6 @@
 
 namespace OCA\Deck\Db;
 
-
-
-use OCP\IDb;
 use OCP\IDBConnection;
 
 
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 5438031b3..e445c8255 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -23,7 +23,7 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\IDb;
+use OCP\IDBConnection;
 
 
 class BoardMapper extends DeckMapper implements IPermissionMapper {
@@ -32,7 +32,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 	private $aclMapper;
 	private $stackMapper;
 
-	public function __construct(IDb $db, LabelMapper $labelMapper, AclMapper $aclMapper, StackMapper $stackMapper) {
+	public function __construct(IDBConnection $db, LabelMapper $labelMapper, AclMapper $aclMapper, StackMapper $stackMapper) {
 		parent::__construct($db, 'deck_boards', '\OCA\Deck\Db\Board');
 		$this->labelMapper = $labelMapper;
 		$this->aclMapper = $aclMapper;
diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php
index e00948a41..862049d6c 100644
--- a/lib/Db/CardMapper.php
+++ b/lib/Db/CardMapper.php
@@ -24,14 +24,15 @@
 namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
-use OCP\IDb;
+use OCP\IDBConnection;
+
 
 
 class CardMapper extends DeckMapper implements IPermissionMapper {
 
     private $labelMapper;
 
-    public function __construct(IDb $db, LabelMapper $labelMapper) {
+    public function __construct(IDBConnection $db, LabelMapper $labelMapper) {
         parent::__construct($db, 'deck_cards', '\OCA\Deck\Db\Card');
         $this->labelMapper = $labelMapper;
     }
diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php
index 5a86c0069..80835edd3 100644
--- a/lib/Db/LabelMapper.php
+++ b/lib/Db/LabelMapper.php
@@ -23,12 +23,12 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\IDb;
+use OCP\IDBConnection;
 
 
 class LabelMapper extends DeckMapper implements IPermissionMapper {
 
-    public function __construct(IDb $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
     }
 
diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php
index db4ee18b9..ecbdd8211 100644
--- a/lib/Db/StackMapper.php
+++ b/lib/Db/StackMapper.php
@@ -24,14 +24,14 @@
 namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
-use OCP\IDb;
+use OCP\IDBConnection;
 
 
 class StackMapper extends DeckMapper implements IPermissionMapper {
 
     private $cardMapper;
 
-    public function __construct(IDb $db, CardMapper $cardMapper) {
+    public function __construct(IDBConnection $db, CardMapper $cardMapper) {
         parent::__construct($db, 'deck_stacks', '\OCA\Deck\Db\Stack');
         $this->cardMapper = $cardMapper;
     }
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index a01e46a49..f8b81e391 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -30,9 +30,9 @@ use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IL10N;
 
-use \OCA\Deck\Db\Board;
-use \OCA\Deck\Db\BoardMapper;
-use \OCA\Deck\Db\LabelMapper;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\LabelMapper;
 
 
 class BoardService {
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 6b4bc8af8..784c6666b 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -23,9 +23,9 @@
 
 namespace OCA\Deck\Service;
 
-use \OCA\Deck\Db\Card;
-use \OCA\Deck\Db\CardMapper;
-use \OCA\Deck\CardArchivedException;
+use OCA\Deck\Db\Card;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\CardArchivedException;
 
 
 class CardService  {
diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php
index 0a8e2d843..ad6bd11df 100644
--- a/lib/Service/LabelService.php
+++ b/lib/Service/LabelService.php
@@ -26,9 +26,7 @@ namespace OCA\Deck\Service;
 use OCA\Deck\Db\Label;
 use OCP\ILogger;
 use OCP\IL10N;
-
-
-use \OCA\Deck\Db\LabelMapper;
+use OCA\Deck\Db\LabelMapper;
 
 
 class LabelService  {
diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php
index ae0f63954..2dece19c6 100644
--- a/lib/Service/PermissionService.php
+++ b/lib/Service/PermissionService.php
@@ -25,7 +25,7 @@ namespace OCA\Deck\Service;
 
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
-use \OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\BoardMapper;
 use OCP\IGroupManager;
 use OCP\ILogger;
 
diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php
index 3fc21a27d..5e3d4e138 100644
--- a/lib/Service/StackService.php
+++ b/lib/Service/StackService.php
@@ -30,9 +30,9 @@ use OCP\IL10N;
 
 use OCP\AppFramework\Utility\ITimeFactory;
 
-use \OCA\Deck\Db\Stack;
+use OCA\Deck\Db\Stack;
 
-use \OCA\Deck\Db\StackMapper;
+use OCA\Deck\Db\StackMapper;
 
 
 class StackService  {