diff --git a/src/Exceptions/NoTenantIdentifiedException.php b/src/Exceptions/NoTenantIdentifiedException.php
index 5a87aead..46e4b027 100644
--- a/src/Exceptions/NoTenantIdentifiedException.php
+++ b/src/Exceptions/NoTenantIdentifiedException.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Exceptions;
 
-class NoTenantIdentifiedException extends Exception
+class NoTenantIdentifiedException extends \Exception
 {
     protected $message = 'No tenant has been identified yet.';
 }
diff --git a/src/Jobs/QueuedTenantDatabaseCreator.php b/src/Jobs/QueuedTenantDatabaseCreator.php
index a3fe776e..5d026d56 100644
--- a/src/Jobs/QueuedTenantDatabaseCreator.php
+++ b/src/Jobs/QueuedTenantDatabaseCreator.php
@@ -9,7 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Stancl\Tenancy\Interfaces\TenantDatabaseManager;
+use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 
 class QueuedTenantDatabaseCreator implements ShouldQueue
 {
diff --git a/src/Jobs/QueuedTenantDatabaseDeleter.php b/src/Jobs/QueuedTenantDatabaseDeleter.php
index 5dcce1cb..170686cc 100644
--- a/src/Jobs/QueuedTenantDatabaseDeleter.php
+++ b/src/Jobs/QueuedTenantDatabaseDeleter.php
@@ -9,7 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Stancl\Tenancy\Interfaces\TenantDatabaseManager;
+use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 
 class QueuedTenantDatabaseDeleter implements ShouldQueue
 {
diff --git a/src/StorageDrivers/DatabaseStorageDriver.php b/src/StorageDrivers/DatabaseStorageDriver.php
index 3de91c33..55551ff9 100644
--- a/src/StorageDrivers/DatabaseStorageDriver.php
+++ b/src/StorageDrivers/DatabaseStorageDriver.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Stancl\Tenancy\StorageDrivers;
 
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
-use Stancl\Tenancy\Interfaces\StorageDriver;
+use Stancl\Tenancy\Contracts\StorageDriver;
 use Stancl\Tenancy\TenantModel as Tenant;
 
 class DatabaseStorageDriver implements StorageDriver
diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php
index f16f4469..97eff562 100644
--- a/src/StorageDrivers/RedisStorageDriver.php
+++ b/src/StorageDrivers/RedisStorageDriver.php
@@ -7,7 +7,7 @@ namespace Stancl\Tenancy\StorageDrivers;
 use Illuminate\Contracts\Redis\Factory as Redis;
 use Illuminate\Foundation\Application;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
-use Stancl\Tenancy\Interfaces\StorageDriver;
+use Stancl\Tenancy\Contracts\StorageDriver;
 use Stancl\Tenancy\Tenant;
 
 class RedisStorageDriver implements StorageDriver
diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index 8a88a090..6d3b63d8 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -13,7 +13,7 @@ use Stancl\Tenancy\Commands\Rollback;
 use Stancl\Tenancy\Commands\Run;
 use Stancl\Tenancy\Commands\Seed;
 use Stancl\Tenancy\Commands\TenantList;
-use Stancl\Tenancy\Interfaces\StorageDriver;
+use Stancl\Tenancy\Contracts\StorageDriver;
 
 class TenancyServiceProvider extends ServiceProvider
 {