diff --git a/composer.json b/composer.json
index 73b13bf..94b9272 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,9 @@
 {
-    "name": "optimus/heimdal",
+    "name": "digitalroll/heimdal",
+    "description": "Laravel 9 support",
     "autoload": {
         "psr-4": {
-            "Optimus\\Heimdal\\": "src/"
+            "Digitalroll\\Heimdal\\": "src/"
         }
     },
     "autoload-dev": {
@@ -11,7 +12,7 @@
         ]
     },
     "require": {
-        "laravel/framework": "~7.0|~8.0"
+        "laravel/framework": "~7.0|~8.0|~9.0"
     },
     "require-dev": {
         "mockery/mockery": "1.3.*",
diff --git a/src/ExceptionHandler.php b/src/ExceptionHandler.php
index b8d7d96..c7f0b1a 100644
--- a/src/ExceptionHandler.php
+++ b/src/ExceptionHandler.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Optimus\Heimdal;
+namespace Digitalroll\Heimdal;
 
 use Throwable;
 use ReflectionClass;
 use InvalidArgumentException;
 use Asm89\Stack\CorsService;
 use Illuminate\Foundation\Exceptions\Handler as LaravelExceptionHandler;
-use Optimus\Heimdal\Formatters\BaseFormatter;
-use Optimus\Heimdal\Reporters\ReporterInterface;
+use Digitalroll\Heimdal\Formatters\BaseFormatter;
+use Digitalroll\Heimdal\Reporters\ReporterInterface;
 use Illuminate\Contracts\Container\Container;
 
 class ExceptionHandler extends LaravelExceptionHandler
@@ -93,7 +93,7 @@ public function render($request, Throwable $e)
         if ($this->config['add_cors_headers']) {
             if (!class_exists(CorsService::class)) {
                 throw new InvalidArgumentException(
-                    'asm89/stack-cors has not been installed. Optimus\Heimdal needs it for adding CORS headers to response.'
+                    'asm89/stack-cors has not been installed. Digitalroll\Heimdal needs it for adding CORS headers to response.'
                 );
             }
 
diff --git a/src/Formatters/BaseFormatter.php b/src/Formatters/BaseFormatter.php
index 61e94d2..55f2cb9 100644
--- a/src/Formatters/BaseFormatter.php
+++ b/src/Formatters/BaseFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Optimus\Heimdal\Formatters;
+namespace Digitalroll\Heimdal\Formatters;
 
 use Throwable;
 use Illuminate\Http\JsonResponse;
diff --git a/src/Formatters/ExceptionFormatter.php b/src/Formatters/ExceptionFormatter.php
index 173de24..19f4b83 100644
--- a/src/Formatters/ExceptionFormatter.php
+++ b/src/Formatters/ExceptionFormatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Optimus\Heimdal\Formatters;
+namespace Digitalroll\Heimdal\Formatters;
 
 use Throwable;
 use Illuminate\Http\JsonResponse;
-use Optimus\Heimdal\Formatters\BaseFormatter;
+use Digitalroll\Heimdal\Formatters\BaseFormatter;
 
 class ExceptionFormatter extends BaseFormatter
 {
diff --git a/src/Formatters/HttpExceptionFormatter.php b/src/Formatters/HttpExceptionFormatter.php
index a736d37..3062d5d 100644
--- a/src/Formatters/HttpExceptionFormatter.php
+++ b/src/Formatters/HttpExceptionFormatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Optimus\Heimdal\Formatters;
+namespace Digitalroll\Heimdal\Formatters;
 
 use Throwable;
 use Illuminate\Http\JsonResponse;
-use Optimus\Heimdal\Formatters\ExceptionFormatter;
+use Digitalroll\Heimdal\Formatters\ExceptionFormatter;
 
 class HttpExceptionFormatter extends ExceptionFormatter
 {
diff --git a/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php b/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php
index 89f0de8..ec4e450 100644
--- a/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php
+++ b/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Optimus\Heimdal\Formatters;
+namespace Digitalroll\Heimdal\Formatters;
 
 use Throwable;
 use Illuminate\Http\JsonResponse;
-use Optimus\Heimdal\Formatters\BaseFormatter;
+use Digitalroll\Heimdal\Formatters\BaseFormatter;
 
 class UnprocessableEntityHttpExceptionFormatter extends BaseFormatter
 {
diff --git a/src/Provider/LaravelServiceProvider.php b/src/Provider/LaravelServiceProvider.php
index d79ec97..d3f9319 100644
--- a/src/Provider/LaravelServiceProvider.php
+++ b/src/Provider/LaravelServiceProvider.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Optimus\Heimdal\Provider;
+namespace Digitalroll\Heimdal\Provider;
 
 use Illuminate\Support\ServiceProvider as BaseProvider;
-use Optimus\Heimdal\Reporters\BugsnagReporter;
-use Optimus\Heimdal\Reporters\RollbarReporter;
-use Optimus\Heimdal\Reporters\SentryReporter;
+use Digitalroll\Heimdal\Reporters\BugsnagReporter;
+use Digitalroll\Heimdal\Reporters\RollbarReporter;
+use Digitalroll\Heimdal\Reporters\SentryReporter;
 
 class LaravelServiceProvider extends BaseProvider {
 
diff --git a/src/Reporters/BugsnagReporter.php b/src/Reporters/BugsnagReporter.php
index 932db0b..4e92b94 100644
--- a/src/Reporters/BugsnagReporter.php
+++ b/src/Reporters/BugsnagReporter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Optimus\Heimdal\Reporters;
+namespace Digitalroll\Heimdal\Reporters;
 
 use Throwable;
 use Bugsnag\Client;
diff --git a/src/Reporters/ReporterInterface.php b/src/Reporters/ReporterInterface.php
index deebae8..19cfbc9 100644
--- a/src/Reporters/ReporterInterface.php
+++ b/src/Reporters/ReporterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Optimus\Heimdal\Reporters;
+namespace Digitalroll\Heimdal\Reporters;
 
 use Throwable;
 
diff --git a/src/Reporters/RollbarReporter.php b/src/Reporters/RollbarReporter.php
index f2cb31e..0f88497 100644
--- a/src/Reporters/RollbarReporter.php
+++ b/src/Reporters/RollbarReporter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Optimus\Heimdal\Reporters;
+namespace Digitalroll\Heimdal\Reporters;
 
 use Throwable;
 use Rollbar;
diff --git a/src/Reporters/SentryReporter.php b/src/Reporters/SentryReporter.php
index a9c330b..d097b5c 100644
--- a/src/Reporters/SentryReporter.php
+++ b/src/Reporters/SentryReporter.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Optimus\Heimdal\Reporters;
+namespace Digitalroll\Heimdal\Reporters;
 
 use Throwable;
 use InvalidArgumentException;
 use Raven_Client;
-use Optimus\Heimdal\Reporters\ReporterInterface;
+use Digitalroll\Heimdal\Reporters\ReporterInterface;
 
 class SentryReporter implements ReporterInterface
 {
diff --git a/src/ResponseFactory.php b/src/ResponseFactory.php
index 0df0ece..f9a2a42 100644
--- a/src/ResponseFactory.php
+++ b/src/ResponseFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Optimus\Heimdal;
+namespace Digitalroll\Heimdal;
 
 use Throwable;
 use Illuminate\Http\JsonResponse;
diff --git a/src/config/optimus.heimdal.php b/src/config/optimus.heimdal.php
index 35d82de..71f973b 100644
--- a/src/config/optimus.heimdal.php
+++ b/src/config/optimus.heimdal.php
@@ -1,7 +1,7 @@
 <?php
 
 use Symfony\Component\HttpKernel\Exception as SymfonyException;
-use Optimus\Heimdal\Formatters;
+use Digitalroll\Heimdal\Formatters;
 
 return [
     'add_cors_headers' => false,
@@ -13,11 +13,11 @@
         Throwable::class => Formatters\ExceptionFormatter::class,
     ],
 
-    'response_factory' => \Optimus\Heimdal\ResponseFactory::class,
+    'response_factory' => \Digitalroll\Heimdal\ResponseFactory::class,
 
     'reporters' => [
         /*'sentry' => [
-            'class'  => \Optimus\Heimdal\Reporters\SentryReporter::class,
+            'class'  => \Digitalroll\Heimdal\Reporters\SentryReporter::class,
             'config' => [
                 'dsn' => '',
                 // For extra options see https://docs.sentry.io/clients/php/config/
diff --git a/tests/ExceptionHandlerTest.php b/tests/ExceptionHandlerTest.php
index e5ceb7b..45541e4 100644
--- a/tests/ExceptionHandlerTest.php
+++ b/tests/ExceptionHandlerTest.php
@@ -2,8 +2,8 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
-use Optimus\Heimdal\ExceptionHandler;
-use Optimus\Heimdal\Formatters\BaseFormatter;
+use Digitalroll\Heimdal\ExceptionHandler;
+use Digitalroll\Heimdal\Formatters\BaseFormatter;
 use Orchestra\Testbench\TestCase;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/tests/Formatters/ExceptionFormatterTest.php b/tests/Formatters/ExceptionFormatterTest.php
index 253ec22..6d238d6 100644
--- a/tests/Formatters/ExceptionFormatterTest.php
+++ b/tests/Formatters/ExceptionFormatterTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Optimus\Heimdal\Formatters\ExceptionFormatter;
-use Optimus\Heimdal\ResponseFactory;
+use Digitalroll\Heimdal\Formatters\ExceptionFormatter;
+use Digitalroll\Heimdal\ResponseFactory;
 use Orchestra\Testbench\TestCase;
 
 class ExceptionFormatterTest extends TestCase
diff --git a/tests/Formatters/HttpExceptionFormatterTest.php b/tests/Formatters/HttpExceptionFormatterTest.php
index 87a402f..1889c71 100644
--- a/tests/Formatters/HttpExceptionFormatterTest.php
+++ b/tests/Formatters/HttpExceptionFormatterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Optimus\Heimdal\Formatters\ExceptionFormatter;
-use Optimus\Heimdal\Formatters\HttpExceptionFormatter;
-use Optimus\Heimdal\ResponseFactory;
+use Digitalroll\Heimdal\Formatters\ExceptionFormatter;
+use Digitalroll\Heimdal\Formatters\HttpExceptionFormatter;
+use Digitalroll\Heimdal\ResponseFactory;
 use Orchestra\Testbench\TestCase;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
diff --git a/tests/Formatters/UnprocessableEntityHttpExceptionFormatterTest.php b/tests/Formatters/UnprocessableEntityHttpExceptionFormatterTest.php
index 5a44110..cde2f92 100644
--- a/tests/Formatters/UnprocessableEntityHttpExceptionFormatterTest.php
+++ b/tests/Formatters/UnprocessableEntityHttpExceptionFormatterTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Optimus\Heimdal\Formatters\UnprocessableEntityHttpExceptionFormatter;
-use Optimus\Heimdal\ResponseFactory;
+use Digitalroll\Heimdal\Formatters\UnprocessableEntityHttpExceptionFormatter;
+use Digitalroll\Heimdal\ResponseFactory;
 use Orchestra\Testbench\TestCase;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
diff --git a/tests/Reporters/BugsnagReporterTest.php b/tests/Reporters/BugsnagReporterTest.php
index cda273c..edc7cc2 100644
--- a/tests/Reporters/BugsnagReporterTest.php
+++ b/tests/Reporters/BugsnagReporterTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Bugsnag\Client;
-use Optimus\Heimdal\Reporters\BugsnagReporter;
+use Digitalroll\Heimdal\Reporters\BugsnagReporter;
 use Orchestra\Testbench\TestCase;
 
 class BugsnagReporterTest extends TestCase
diff --git a/tests/ResponseFactoryTest.php b/tests/ResponseFactoryTest.php
index c5e0e0a..117a327 100644
--- a/tests/ResponseFactoryTest.php
+++ b/tests/ResponseFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Http\JsonResponse;
-use Optimus\Heimdal\ResponseFactory;
+use Digitalroll\Heimdal\ResponseFactory;
 use Orchestra\Testbench\TestCase;
 
 class ResponseFactoryTest extends TestCase
diff --git a/tests/helpers.php b/tests/helpers.php
index bd2bdd0..68b9433 100644
--- a/tests/helpers.php
+++ b/tests/helpers.php
@@ -1,6 +1,6 @@
 <?php
 
-use Optimus\Heimdal\Reporters\ReporterInterface;
+use Digitalroll\Heimdal\Reporters\ReporterInterface;
 
 class TestReporter implements ReporterInterface
 {