diff --git a/Admin/Activate.php b/Admin/Activate.php
index 7886929..80d7c8b 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -16,7 +16,7 @@
 namespace Modules\Navigation\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index b0a249b..0ff69e9 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -16,7 +16,7 @@
 namespace Modules\Navigation\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }
diff --git a/Admin/Installer.php b/Admin/Installer.php
index e841b31..3235d0d 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -16,7 +16,7 @@
 namespace Modules\Navigation\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
@@ -37,7 +37,7 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(string $path, Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
         parent::install($path, $dbPool, $info);
 
@@ -75,7 +75,7 @@ class Installer extends InstallerAbstract
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public static function installExternal(Pool $dbPool, array $data)
+    public static function installExternal(DatabasePool $dbPool, array $data)
     {
         try {
             $dbPool->get('core')->con->query('select 1 from `' . $dbPool->get('core')->prefix . 'nav`');
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 40c5fcb..243bfb7 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -16,7 +16,7 @@
 namespace Modules\Navigation\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\UninstallAbstract;
 
@@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
 
diff --git a/Admin/Update.php b/Admin/Update.php
index dce4d97..78dd8db 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -16,7 +16,7 @@
 namespace Modules\Navigation\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
 
@@ -37,7 +37,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, array $info)
+    public static function update(DatabasePool $dbPool, array $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');
diff --git a/Models/Navigation.php b/Models/Navigation.php
index 9f10c4c..3fd0081 100644
--- a/Models/Navigation.php
+++ b/Models/Navigation.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Navigation\Models;
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Message\RequestAbstract;
 
 /**
@@ -67,7 +67,7 @@ class Navigation
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    private function __construct(RequestAbstract $request, Pool $dbPool = null)
+    private function __construct(RequestAbstract $request, DatabasePool $dbPool = null)
     {
         $this->dbPool = $dbPool;
         $this->load($request->getHash());
@@ -126,7 +126,7 @@ class Navigation
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public static function getInstance(RequestAbstract $request = null, Pool $dbPool = null)
+    public static function getInstance(RequestAbstract $request = null, DatabasePool $dbPool = null)
     {
         if (!isset(self::$instance)) {
             if(!isset($request) || !isset($dbPool)) {