diff --git a/Admin/Install/db.json b/Admin/Install/db.json
index 1ea3978..02d0216 100755
--- a/Admin/Install/db.json
+++ b/Admin/Install/db.json
@@ -82,8 +82,8 @@
                 "type": "INT",
                 "null": true,
                 "default": null,
-                "foreignTable": "organization_unit",
-                "foreignKey": "organization_unit_id"
+                "foreignTable": "unit",
+                "foreignKey": "unit_id"
             },
             "hr_staff_history_department": {
                 "name": "hr_staff_history_department",
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index a80c40c..450a86b 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -80,7 +80,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         };
 
         $this->app->dbPool         = $GLOBALS['dbpool'];
-        $this->app->orgId          = 1;
+        $this->app->unitId          = 1;
         $this->app->accountManager = new AccountManager($GLOBALS['session']);
         $this->app->appSettings    = new CoreSettings();
         $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');