diff --git a/application/forms/AddNodeForm.php b/application/forms/AddNodeForm.php
index 40f533c..063914c 100644
--- a/application/forms/AddNodeForm.php
+++ b/application/forms/AddNodeForm.php
@@ -4,7 +4,6 @@ namespace Icinga\Module\Businessprocess\Forms;
 
 use Icinga\Module\Businessprocess\BpNode;
 use Icinga\Module\Businessprocess\BpConfig;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Businessprocess\Common\EnumList;
 use Icinga\Module\Businessprocess\ImportedNode;
 use Icinga\Module\Businessprocess\Modification\ProcessChanges;
@@ -13,12 +12,13 @@ use Icinga\Module\Businessprocess\Web\Form\QuickForm;
 use Icinga\Module\Businessprocess\Web\Form\Validator\NoDuplicateChildrenValidator;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Session\SessionNamespace;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class AddNodeForm extends QuickForm
 {
     use EnumList;
 
-    /** @var MonitoringBackend|IcingadbDatabase */
+    /** @var MonitoringBackend|IcingaDbConnection*/
     protected $backend;
 
     /** @var Storage */
@@ -404,7 +404,7 @@ class AddNodeForm extends QuickForm
     }
 
     /**
-     * @param MonitoringBackend|IcingadbDatabase $backend
+     * @param MonitoringBackend|IcingaDbConnection $backend
      * @return $this
      */
     public function setBackend($backend)
diff --git a/application/forms/DeleteNodeForm.php b/application/forms/DeleteNodeForm.php
index f16154f..dada9d3 100644
--- a/application/forms/DeleteNodeForm.php
+++ b/application/forms/DeleteNodeForm.php
@@ -7,13 +7,13 @@ use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\Modification\ProcessChanges;
 use Icinga\Module\Businessprocess\Node;
 use Icinga\Module\Businessprocess\Web\Form\QuickForm;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Session\SessionNamespace;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class DeleteNodeForm extends QuickForm
 {
-    /** @var MonitoringBackend|IcingadbDatabase */
+    /** @var MonitoringBackend|IcingaDbConnection */
     protected $backend;
 
     /** @var BpConfig */
@@ -80,7 +80,7 @@ class DeleteNodeForm extends QuickForm
     }
 
     /**
-     * @param MonitoringBackend|IcingadbDatabase $backend
+     * @param MonitoringBackend|IcingaDbConnection $backend
      * @return $this
      */
     public function setBackend($backend)
diff --git a/application/forms/EditNodeForm.php b/application/forms/EditNodeForm.php
index e476b5e..6f47ba9 100644
--- a/application/forms/EditNodeForm.php
+++ b/application/forms/EditNodeForm.php
@@ -9,15 +9,15 @@ use Icinga\Module\Businessprocess\Modification\ProcessChanges;
 use Icinga\Module\Businessprocess\Node;
 use Icinga\Module\Businessprocess\Web\Form\QuickForm;
 use Icinga\Module\Businessprocess\Web\Form\Validator\NoDuplicateChildrenValidator;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Session\SessionNamespace;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class EditNodeForm extends QuickForm
 {
     use EnumList;
 
-    /** @var MonitoringBackend|IcingadbDatabase */
+    /** @var MonitoringBackend|IcingaDbConnection */
     protected $backend;
 
     /** @var string $backendName */
@@ -299,7 +299,7 @@ class EditNodeForm extends QuickForm
     }
 
     /**
-     * @param MonitoringBackend|IcingadbDatabase $backend
+     * @param MonitoringBackend|IcingaDbConnection $backend
      * @return $this
      */
     public function setBackend($backend)
diff --git a/application/forms/ProcessForm.php b/application/forms/ProcessForm.php
index 8559aaa..7cc81c2 100644
--- a/application/forms/ProcessForm.php
+++ b/application/forms/ProcessForm.php
@@ -6,14 +6,14 @@ use Icinga\Module\Businessprocess\BpNode;
 use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\Modification\ProcessChanges;
 use Icinga\Module\Businessprocess\Web\Form\QuickForm;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Notification;
 use Icinga\Web\Session\SessionNamespace;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class ProcessForm extends QuickForm
 {
-    /** @var MonitoringBackend|IcingadbDatabase */
+    /** @var MonitoringBackend|IcingaDbConnection */
     protected $backend;
 
     /** @var BpConfig */
@@ -111,7 +111,7 @@ class ProcessForm extends QuickForm
     }
 
     /**
-     * @param MonitoringBackend|IcingadbDatabase $backend
+     * @param MonitoringBackend|IcingaDbConnection $backend
      * @return $this
      */
     public function setBackend($backend)
diff --git a/library/Businessprocess/BpConfig.php b/library/Businessprocess/BpConfig.php
index 6ef03df..e9089de 100644
--- a/library/Businessprocess/BpConfig.php
+++ b/library/Businessprocess/BpConfig.php
@@ -10,8 +10,8 @@ use Icinga\Module\Businessprocess\Exception\NestingError;
 use Icinga\Module\Businessprocess\Modification\ProcessChanges;
 use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
 use Icinga\Module\Businessprocess\Storage\LegacyStorage;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class BpConfig
 {
@@ -29,7 +29,7 @@ class BpConfig
     /**
      * Backend to retrieve states from
      *
-     * @var MonitoringBackend|IcingadbDatabase
+     * @var MonitoringBackend|IcingaDbConnection
      */
     protected $backend;
 
diff --git a/library/Businessprocess/IcingaDbObject.php b/library/Businessprocess/IcingaDbObject.php
index 2fc9347..cad459f 100644
--- a/library/Businessprocess/IcingaDbObject.php
+++ b/library/Businessprocess/IcingaDbObject.php
@@ -6,6 +6,7 @@ use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\Service;
+use ipl\Sql\Connection as IcingaDbConnection;
 use ipl\Web\Filter\QueryString;
 
 class IcingaDbObject
@@ -17,7 +18,7 @@ class IcingaDbObject
     /** @var BpConfig */
     protected $config;
 
-    /** @var IcingadbDatabase */
+    /** @var IcingaDbConnection */
     protected $conn;
 
     public function __construct()
diff --git a/library/Businessprocess/State/IcingaDbState.php b/library/Businessprocess/State/IcingaDbState.php
index 55d64d1..cd931ec 100644
--- a/library/Businessprocess/State/IcingaDbState.php
+++ b/library/Businessprocess/State/IcingaDbState.php
@@ -8,9 +8,9 @@ use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\IcingaDbObject;
 use Icinga\Module\Businessprocess\ServiceNode;
 use Icinga\Module\Icingadb\Common\Auth;
-use Icinga\Module\Icingadb\Common\Database as IcingadbDatabase;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\Service;
+use ipl\Sql\Connection as IcingaDbConnection;
 
 class IcingaDbState
 {
@@ -19,7 +19,7 @@ class IcingaDbState
     /** @var BpConfig */
     protected $config;
 
-    /** @var IcingadbDatabase */
+    /** @var IcingaDbConnection */
     protected $backend;
 
     public function __construct(BpConfig $config)