diff --git a/Admin/Activate.php b/Admin/Activate.php
index 1e65bcf..e9eb8a6 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Navigation\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\ActivateAbstract;
 
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 19d7c99..fa8cfba 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Navigation\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\DeactivateAbstract;
 
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 8027959..2f59d85 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Navigation\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\UninstallAbstract;
 
diff --git a/Admin/Update.php b/Admin/Update.php
index 1939508..1cba18c 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -15,9 +15,10 @@
  */
 namespace Modules\Navigation\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
+
 use phpOMS\DataStorage\Database\Pool;
 use phpOMS\Module\UpdateAbstract;
+use phpOMS\System\FileSystem;
 
 /**
  * Navigation class.
@@ -38,6 +39,8 @@ class Update extends UpdateAbstract
      */
     public static function update(Pool $dbPool, array $info)
     {
+        FileSystem::deletePath(__DIR__ . '/Update');
+        mkdir('Update');
         parent::update($dbPool, $info);
     }
 }
diff --git a/Controller.php b/Controller.php
index b6a4431..ad446c9 100644
--- a/Controller.php
+++ b/Controller.php
@@ -104,7 +104,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var \string
      * @since 1.0.0
      */
-    protected static $module = 'Navigation';
+    const MODULE_NAME = 'Navigation';
 
     /**
      * Localization files.
@@ -155,7 +155,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $language = $this->app->accountManager->get($request->getAccount())->getL11n()->getLanguage();
 
         foreach ($modules as $id => $module) {
-            $this->app->accountManager->get($request->getAccount())->getL11n()->loadLanguage($language, 'nav.backend', $module[0]['module_path']);
+            $this->app->accountManager->get($request->getAccount())->getL11n()->loadLanguage($language, 'Navigation', $module[0]['module_path']);
         }
 
         if (!empty($this->nav)) {
diff --git a/lang/en.lang.php b/Theme/backend/Lang/en.lang.php
similarity index 100%
rename from lang/en.lang.php
rename to Theme/backend/Lang/en.lang.php