diff --git a/Admin/Installer.php b/Admin/Installer.php
index 7e21bea..6a2e954 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -113,7 +113,7 @@ final class Installer extends InstallerAbstract
         };
 
         $apiApp->dbPool         = $app->dbPool;
-        $apiApp->orgId          = $app->orgId;
+        $apiApp->unitId          = $app->unitId;
         $apiApp->accountManager = $app->accountManager;
         $apiApp->appSettings    = $app->appSettings;
         $apiApp->moduleManager  = $app->moduleManager;
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index df359bc..a5fcf00 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -57,7 +57,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/');