diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ebb9ec..34afc81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Added
 - Compatibility with PHP 8.3
 
+### Changed
+- Namespace from `Brotkrueml\JobRouterClient` to `JobRouter\AddOn\RestClient`
+
 ## [2.0.0] - 2023-02-28
 
 ### Added
diff --git a/composer.json b/composer.json
index 945816e..4657cc8 100644
--- a/composer.json
+++ b/composer.json
@@ -43,12 +43,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Brotkrueml\\JobRouterClient\\": "src/"
+            "JobRouter\\AddOn\\RestClient\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Brotkrueml\\JobRouterClient\\Tests\\": "tests/"
+            "JobRouter\\AddOn\\RestClient\\Tests\\": "tests/"
         }
     },
     "config": {
diff --git a/docs/api/authenticationexception.rst b/docs/api/authenticationexception.rst
index cd769ac..c5c034f 100644
--- a/docs/api/authenticationexception.rst
+++ b/docs/api/authenticationexception.rst
@@ -6,6 +6,6 @@
 Exception\\AuthenticationException
 ==================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\AuthenticationException
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\AuthenticationException
 
    This exception is thrown if the authentication does not succeed.
diff --git a/docs/api/clientconfiguration.rst b/docs/api/clientconfiguration.rst
index 5b8a42a..48c70de 100644
--- a/docs/api/clientconfiguration.rst
+++ b/docs/api/clientconfiguration.rst
@@ -6,7 +6,7 @@
 Configuration\\ClientConfiguration
 ==================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Configuration\ClientConfiguration
+.. php:class:: final class JobRouter\AddOn\RestClient\Configuration\ClientConfiguration
 
    Immutable value object that represents the configuration for a RestClient.
 
@@ -59,7 +59,7 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/clientdecorator.rst b/docs/api/clientdecorator.rst
index 7f97230..1b795dd 100644
--- a/docs/api/clientdecorator.rst
+++ b/docs/api/clientdecorator.rst
@@ -6,7 +6,7 @@
 Client\\ClientDecorator
 =======================
 
-.. php:class:: abstract class Brotkrueml\JobRouterClient\Client\ClientDecorator
+.. php:class:: abstract class JobRouter\AddOn\RestClient\Client\ClientDecorator
 
    :implements: :ref:`Brotkrueml\\JobRouterClient\\Client\\ClientInterface <api-clientinterface>`
 
diff --git a/docs/api/clientfactory.rst b/docs/api/clientfactory.rst
index ce5ed5d..049bdc7 100644
--- a/docs/api/clientfactory.rst
+++ b/docs/api/clientfactory.rst
@@ -6,7 +6,7 @@
 Client\\ClientFactory
 =====================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Client\ClientFactory
+.. php:class:: final class JobRouter\AddOn\RestClient\Client\ClientFactory
 
    Factory for instantiating the rest client and the client decorators.
 
diff --git a/docs/api/clientinterface.rst b/docs/api/clientinterface.rst
index aae1654..a49744c 100644
--- a/docs/api/clientinterface.rst
+++ b/docs/api/clientinterface.rst
@@ -6,7 +6,7 @@
 Client\\ClientInterface
 =======================
 
-.. php:class:: interface Brotkrueml\JobRouterClient\Client\ClientInterface
+.. php:class:: interface JobRouter\AddOn\RestClient\Client\ClientInterface
 
    Interface for a REST client.
 
diff --git a/docs/api/clientoptions.rst b/docs/api/clientoptions.rst
index dfd4770..dcd8342 100644
--- a/docs/api/clientoptions.rst
+++ b/docs/api/clientoptions.rst
@@ -6,7 +6,7 @@
 Configuration\\ClientOptions
 ============================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Configuration\ClientOptions
+.. php:class:: final class JobRouter\AddOn\RestClient\Configuration\ClientOptions
 
    Immutable value object that represents the client options which is assigned
    to a :ref:`client configuration <api-clientconfiguration>`.
@@ -27,8 +27,8 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-   use Brotkrueml\JobRouterClient\Configuration\ClientOptions;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Configuration\ClientOptions;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/document.rst b/docs/api/document.rst
index 254f7d3..da02e36 100644
--- a/docs/api/document.rst
+++ b/docs/api/document.rst
@@ -6,7 +6,7 @@
 Model\\Document
 ===============
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Model\Document
+.. php:class:: final class JobRouter\AddOn\RestClient\Model\Document
 
    Document model class which collects the data for the an archive document.
 
@@ -67,8 +67,8 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Model\Document;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Model\Document;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/documentsclientdecorator.rst b/docs/api/documentsclientdecorator.rst
index 2c657b4..d678aca 100644
--- a/docs/api/documentsclientdecorator.rst
+++ b/docs/api/documentsclientdecorator.rst
@@ -6,7 +6,7 @@
 Client\\DocumentsClientDecorator
 ================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator
+.. php:class:: final class JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator
 
    :extends: :ref:`Brotkrueml\\JobRouterClient\\Client\\ClientDecorator <api-clientdecorator>`
 
@@ -41,11 +41,11 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\RestClient;
-   use Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-   use Brotkrueml\JobRouterClient\Model\Document;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Client\RestClient;
+   use JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Model\Document;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/exceptioninterface.rst b/docs/api/exceptioninterface.rst
index 006a30c..48cdfbe 100644
--- a/docs/api/exceptioninterface.rst
+++ b/docs/api/exceptioninterface.rst
@@ -6,7 +6,7 @@
 Exception\\ExceptionInterface
 =============================
 
-.. php:class:: interface Brotkrueml\JobRouterClient\Exception\ExceptionInterface
+.. php:class:: interface JobRouter\AddOn\RestClient\Exception\ExceptionInterface
 
    Interface for a JobRouter Client exception. Every exception thrown inside
    this library implements this interface to simplify the catching of
diff --git a/docs/api/file.rst b/docs/api/file.rst
index 6a70e7c..596a56c 100644
--- a/docs/api/file.rst
+++ b/docs/api/file.rst
@@ -6,7 +6,7 @@
 Resource\\File
 ==============
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Resource\File
+.. php:class:: final class JobRouter\AddOn\RestClient\Resource\File
 
    Value object that represents a file.
 
@@ -41,7 +41,7 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/fileinterface.rst b/docs/api/fileinterface.rst
index 8a0313c..1f76ef9 100644
--- a/docs/api/fileinterface.rst
+++ b/docs/api/fileinterface.rst
@@ -6,6 +6,6 @@
 Resource\\FileInterface
 =======================
 
-.. php:class:: interface Brotkrueml\JobRouterClient\Resource\FileInterface
+.. php:class:: interface JobRouter\AddOn\RestClient\Resource\FileInterface
 
    Interface for a file.
diff --git a/docs/api/filestorage.rst b/docs/api/filestorage.rst
index e9a1bba..1703069 100644
--- a/docs/api/filestorage.rst
+++ b/docs/api/filestorage.rst
@@ -6,7 +6,7 @@
 Resource\\FileStorage
 =====================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Resource\FileStorage
+.. php:class:: final class JobRouter\AddOn\RestClient\Resource\FileStorage
 
    A storage for :ref:`Brotkrueml\\JobRouterClient\\Resource\\File <api-file>` objects.
 
@@ -39,7 +39,7 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Resource\FileStorage;
+   use JobRouter\AddOn\RestClient\Resource\FileStorage;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/httpexception.rst b/docs/api/httpexception.rst
index b0ec6b5..fd159f2 100644
--- a/docs/api/httpexception.rst
+++ b/docs/api/httpexception.rst
@@ -6,7 +6,7 @@
 Exception\\HttpException
 ========================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\HttpException
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\HttpException
 
    This exception is thrown if a HTTP status code is returned for a request
    which indicates an error.
diff --git a/docs/api/incident.rst b/docs/api/incident.rst
index 54b87d8..bb89734 100644
--- a/docs/api/incident.rst
+++ b/docs/api/incident.rst
@@ -6,7 +6,7 @@
 Model\\Incident
 ===============
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Model\Incident
+.. php:class:: final class JobRouter\AddOn\RestClient\Model\Incident
 
    Incident model class which collects the fields for a process instance start.
 
@@ -189,8 +189,8 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Model\Incident;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Model\Incident;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/incidentsclientdecorator.rst b/docs/api/incidentsclientdecorator.rst
index 13b9cbc..e040e0a 100644
--- a/docs/api/incidentsclientdecorator.rst
+++ b/docs/api/incidentsclientdecorator.rst
@@ -6,7 +6,7 @@
 Client\\IncidentsClientDecorator
 ================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\IncidentsClientDecorator
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\IncidentsClientDecorator
 
    :extends: :ref:`Brotkrueml\\JobRouterClient\\Client\\ClientDecorator <api-clientdecorator>`
 
@@ -41,11 +41,11 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\RestClient;
-   use Brotkrueml\JobRouterClient\Client\IncidentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-   use Brotkrueml\JobRouterClient\Model\Incident;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Client\RestClient;
+   use JobRouter\AddOn\RestClient\Client\IncidentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Model\Incident;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/invalidconfigurationexception.rst b/docs/api/invalidconfigurationexception.rst
index 07f9353..269015d 100644
--- a/docs/api/invalidconfigurationexception.rst
+++ b/docs/api/invalidconfigurationexception.rst
@@ -6,7 +6,7 @@
 Exception\\InvalidConfigurationException
 ========================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\InvalidConfigurationException
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\InvalidConfigurationException
 
    This exception is thrown if a value for the configuration is set which is
    not acceptable (like invalid lifetime or empty password).
diff --git a/docs/api/invalidresourceexception.rst b/docs/api/invalidresourceexception.rst
index e21bac6..68ff54b 100644
--- a/docs/api/invalidresourceexception.rst
+++ b/docs/api/invalidresourceexception.rst
@@ -6,7 +6,7 @@
 Exception\\InvalidResourceException
 ===================================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\InvalidResourceException
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\InvalidResourceException
 
    This exception is thrown when a resource is invalid, like a file which does
    not exist.
diff --git a/docs/api/priority.rst b/docs/api/priority.rst
index 00a815f..9d3f8fa 100644
--- a/docs/api/priority.rst
+++ b/docs/api/priority.rst
@@ -6,7 +6,7 @@
 Enumerations\\Priority
 ======================
 
-.. php:class:: enum Brotkrueml\JobRouterClient\Enumerations\Priority
+.. php:class:: enum JobRouter\AddOn\RestClient\Enumerations\Priority
 
    Priority enumeration to be used in :ref:`Incident class <api-incident>`.
 
diff --git a/docs/api/restclient.rst b/docs/api/restclient.rst
index e58183d..8d24ba4 100644
--- a/docs/api/restclient.rst
+++ b/docs/api/restclient.rst
@@ -6,7 +6,7 @@
 Client\\RestClient
 ==================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Client\RestClient
+.. php:class:: final class JobRouter\AddOn\RestClient\Client\RestClient
 
    :implements: :ref:`Brotkrueml\\JobRouterClient\\Client\\ClientInterface <api-clientinterface>`
 
@@ -43,8 +43,8 @@ Usage Example
 ::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\RestClient;
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Client\RestClient;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
 
    require_once 'vendor/autoload.php';
 
diff --git a/docs/api/restclientexception.rst b/docs/api/restclientexception.rst
index 7d59ebd..fb3afa6 100644
--- a/docs/api/restclientexception.rst
+++ b/docs/api/restclientexception.rst
@@ -6,7 +6,7 @@
 Exception\\RestClientException
 ==============================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Exception\RestClientException
+.. php:class:: final class JobRouter\AddOn\RestClient\Exception\RestClientException
 
    This exception is thrown if the REST client discovers an error, like the
    given data for a request is not processable.
diff --git a/docs/api/version.rst b/docs/api/version.rst
index 48a715f..b1b7832 100644
--- a/docs/api/version.rst
+++ b/docs/api/version.rst
@@ -6,7 +6,7 @@
 Information\\Version
 ====================
 
-.. php:class:: final class Brotkrueml\JobRouterClient\Information\Version
+.. php:class:: final class JobRouter\AddOn\RestClient\Information\Version
 
    Version information.
 
diff --git a/docs/usage.rst b/docs/usage.rst
index 56a080a..792bcc8 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -18,9 +18,9 @@ Initialisation of the JobRouter Client
 .. code-block:: php
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\RestClient;
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-   use Brotkrueml\JobRouterClient\Exception\ExceptionInterface;
+   use JobRouter\AddOn\RestClient\Client\RestClient;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Exception\ExceptionInterface;
 
    require_once 'vendor/autoload.php';
 
@@ -46,7 +46,7 @@ Initialisation of the JobRouter Client
 Let's dig into the piece of code:
 
 #. Lines 2-4: The JobRouter client library uses the namespace
-   :php:`Brotkrueml\JobRouterClient`, the :php:`uses` ease the using of the
+   :php:`JobRouter\AddOn\RestClient`, the :php:`uses` ease the using of the
    following classes.
 
 #. Line 6: Require the autoloading file, so the classes are found and can be
@@ -215,7 +215,7 @@ To start a new instance of a process you have to send the data as
 ``multipart/form-data`` instead of JSON like the previous examples::
 
    <?php
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    // The JobRouter Client is already initialised
 
@@ -258,9 +258,9 @@ table and sub table stuff::
 
    <?php
    // Additional uses
-   use Brotkrueml\JobRouterClient\Client\IncidentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Model\Incident;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Client\IncidentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Model\Incident;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    // The JobRouter Client is already initialised
 
@@ -315,7 +315,7 @@ Archiving a document is as easy as :ref:`starting an instance
 <usage.starting-new-instance>`::
 
    <?php
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    // The JobRouter Client is already initialised
 
@@ -342,9 +342,9 @@ array::
 
    <?php
    // Additional uses
-   use Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Model\Document;
-   use Brotkrueml\JobRouterClient\Resource\File;
+   use JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Model\Document;
+   use JobRouter\AddOn\RestClient\Resource\File;
 
    // The JobRouter Client is already initialised
 
@@ -373,11 +373,11 @@ The decorators can be nested. This can be useful when, e.g., posting to a
 JobData table, then archiving a document and at last starting an instance::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Client\IncidentsClientDecorator;
-   use Brotkrueml\JobRouterClient\Client\RestClient;
-   use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-   use Brotkrueml\JobRouterClient\Exception\ExceptionInterface;
+   use JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Client\IncidentsClientDecorator;
+   use JobRouter\AddOn\RestClient\Client\RestClient;
+   use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+   use JobRouter\AddOn\RestClient\Exception\ExceptionInterface;
 
    require_once 'vendor/autoload.php';
 
@@ -402,7 +402,7 @@ To simplify the instantiation of the different clients, you can use a
 can be created with::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\ClientFactory;
+   use JobRouter\AddOn\RestClient\Client\ClientFactory;
 
    $client = ClientFactory::createRestClient(
       'https://example.org/jobrouter/',
@@ -415,7 +415,7 @@ The decorators can also be instantiated with factory methods. This is useful
 when client nesting is not required::
 
    <?php
-   use Brotkrueml\JobRouterClient\Client\ClientFactory;
+   use JobRouter\AddOn\RestClient\Client\ClientFactory;
 
    $incidentsClientDecorator = ClientFactory::createIncidentsClientDecorator(
       'https://example.org/jobrouter/',
diff --git a/ecs.php b/ecs.php
index a58da28..557efc8 100644
--- a/ecs.php
+++ b/ecs.php
@@ -6,10 +6,8 @@
 
 return static function (ECSConfig $config): void {
     $header = <<<HEADER
-This file is part of the JobRouter Client.
-https://github.com/brotkrueml/jobrouter-client
-
-Copyright (c) 2019-2023 Chris Müller
+This file is part of the JobRouter REST Client.
+https://github.com/jobrouter/php-rest-client
 
 For the full copyright and license information, please view the
 LICENSE.txt file that was distributed with this source code.
diff --git a/src/Client/ClientDecorator.php b/src/Client/ClientDecorator.php
index e0dc561..f0768b0 100644
--- a/src/Client/ClientDecorator.php
+++ b/src/Client/ClientDecorator.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/src/Client/ClientFactory.php b/src/Client/ClientFactory.php
index 5e55a62..87af970 100644
--- a/src/Client/ClientFactory.php
+++ b/src/Client/ClientFactory.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
 
 final class ClientFactory
 {
diff --git a/src/Client/ClientInterface.php b/src/Client/ClientInterface.php
index d2e0822..03c473b 100644
--- a/src/Client/ClientInterface.php
+++ b/src/Client/ClientInterface.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/src/Client/DocumentsClientDecorator.php b/src/Client/DocumentsClientDecorator.php
index 5d79358..eed4113 100644
--- a/src/Client/DocumentsClientDecorator.php
+++ b/src/Client/DocumentsClientDecorator.php
@@ -3,21 +3,19 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
-use Brotkrueml\JobRouterClient\Exception\HttpException;
-use Brotkrueml\JobRouterClient\Model\Document;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
-use Brotkrueml\JobRouterClient\Resource\FileStorage;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
+use JobRouter\AddOn\RestClient\Model\Document;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Resource\FileStorage;
 use Psr\Http\Message\ResponseInterface;
 
 final class DocumentsClientDecorator extends ClientDecorator
diff --git a/src/Client/IncidentsClientDecorator.php b/src/Client/IncidentsClientDecorator.php
index 1cf9875..5a69558 100644
--- a/src/Client/IncidentsClientDecorator.php
+++ b/src/Client/IncidentsClientDecorator.php
@@ -3,21 +3,19 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
-use Brotkrueml\JobRouterClient\Enumerations\Priority;
-use Brotkrueml\JobRouterClient\Exception\HttpException;
-use Brotkrueml\JobRouterClient\Model\Incident;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Enumerations\Priority;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
+use JobRouter\AddOn\RestClient\Model\Incident;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use Psr\Http\Message\ResponseInterface;
 
 final class IncidentsClientDecorator extends ClientDecorator
diff --git a/src/Client/RestClient.php b/src/Client/RestClient.php
index d076a46..77606f5 100644
--- a/src/Client/RestClient.php
+++ b/src/Client/RestClient.php
@@ -3,27 +3,25 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Client;
+namespace JobRouter\AddOn\RestClient\Client;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-use Brotkrueml\JobRouterClient\Exception\AuthenticationException;
-use Brotkrueml\JobRouterClient\Exception\HttpException;
-use Brotkrueml\JobRouterClient\Exception\RestClientException;
-use Brotkrueml\JobRouterClient\Mapper\RouteContentTypeMapper;
-use Brotkrueml\JobRouterClient\Middleware\AuthorisationMiddleware;
-use Brotkrueml\JobRouterClient\Middleware\UserAgentMiddleware;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
 use Buzz\Browser;
 use Buzz\Client\Curl;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Exception\AuthenticationException;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
+use JobRouter\AddOn\RestClient\Exception\RestClientException;
+use JobRouter\AddOn\RestClient\Mapper\RouteContentTypeMapper;
+use JobRouter\AddOn\RestClient\Middleware\AuthorisationMiddleware;
+use JobRouter\AddOn\RestClient\Middleware\UserAgentMiddleware;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
diff --git a/src/Configuration/ClientConfiguration.php b/src/Configuration/ClientConfiguration.php
index 145ddf5..2c0aa86 100644
--- a/src/Configuration/ClientConfiguration.php
+++ b/src/Configuration/ClientConfiguration.php
@@ -3,20 +3,18 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Configuration;
+namespace JobRouter\AddOn\RestClient\Configuration;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidConfigurationException;
-use Brotkrueml\JobRouterClient\Exception\InvalidUrlException;
-use Brotkrueml\JobRouterClient\Resource\JobRouterSystem;
+use JobRouter\AddOn\RestClient\Exception\InvalidConfigurationException;
+use JobRouter\AddOn\RestClient\Exception\InvalidUrlException;
+use JobRouter\AddOn\RestClient\Resource\JobRouterSystem;
 
 /**
  * Value object that represents the configuration for a RestClient
diff --git a/src/Configuration/ClientOptions.php b/src/Configuration/ClientOptions.php
index ac48e8b..f2a5dbd 100644
--- a/src/Configuration/ClientOptions.php
+++ b/src/Configuration/ClientOptions.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Configuration;
+namespace JobRouter\AddOn\RestClient\Configuration;
 
 /**
  * Value object with available client options which can be defined
diff --git a/src/Enumerations/Priority.php b/src/Enumerations/Priority.php
index b78e277..197c164 100644
--- a/src/Enumerations/Priority.php
+++ b/src/Enumerations/Priority.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Enumerations;
+namespace JobRouter\AddOn\RestClient\Enumerations;
 
 enum Priority: int
 {
diff --git a/src/Exception/AuthenticationException.php b/src/Exception/AuthenticationException.php
index e637731..5bb8c23 100644
--- a/src/Exception/AuthenticationException.php
+++ b/src/Exception/AuthenticationException.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
 
 final class AuthenticationException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index c202982..b177a37 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 interface ExceptionInterface extends \Throwable
 {
diff --git a/src/Exception/HttpException.php b/src/Exception/HttpException.php
index 6d386db..808e54d 100644
--- a/src/Exception/HttpException.php
+++ b/src/Exception/HttpException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 use Psr\Http\Client\ClientExceptionInterface;
 
diff --git a/src/Exception/InvalidConfigurationException.php b/src/Exception/InvalidConfigurationException.php
index 9268fc0..489eee2 100644
--- a/src/Exception/InvalidConfigurationException.php
+++ b/src/Exception/InvalidConfigurationException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class InvalidConfigurationException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidPoolNumberException.php b/src/Exception/InvalidPoolNumberException.php
index 515fcd7..b7a4201 100644
--- a/src/Exception/InvalidPoolNumberException.php
+++ b/src/Exception/InvalidPoolNumberException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class InvalidPoolNumberException extends \DomainException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidResourceException.php b/src/Exception/InvalidResourceException.php
index 0669063..bddf523 100644
--- a/src/Exception/InvalidResourceException.php
+++ b/src/Exception/InvalidResourceException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class InvalidResourceException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidStepNumberException.php b/src/Exception/InvalidStepNumberException.php
index 54aa0f2..28fdc66 100644
--- a/src/Exception/InvalidStepNumberException.php
+++ b/src/Exception/InvalidStepNumberException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class InvalidStepNumberException extends \DomainException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidUrlException.php b/src/Exception/InvalidUrlException.php
index 02226e9..262476e 100644
--- a/src/Exception/InvalidUrlException.php
+++ b/src/Exception/InvalidUrlException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class InvalidUrlException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Exception/RestClientException.php b/src/Exception/RestClientException.php
index cfe21b6..89d604a 100644
--- a/src/Exception/RestClientException.php
+++ b/src/Exception/RestClientException.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Exception;
+namespace JobRouter\AddOn\RestClient\Exception;
 
 final class RestClientException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Information/Version.php b/src/Information/Version.php
index 1d2a458..46ff43b 100644
--- a/src/Information/Version.php
+++ b/src/Information/Version.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Information;
+namespace JobRouter\AddOn\RestClient\Information;
 
 /**
  * Value object that holds the current version of the library
diff --git a/src/Mapper/RouteContentTypeMapper.php b/src/Mapper/RouteContentTypeMapper.php
index 3718d4c..aab5649 100644
--- a/src/Mapper/RouteContentTypeMapper.php
+++ b/src/Mapper/RouteContentTypeMapper.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Mapper;
+namespace JobRouter\AddOn\RestClient\Mapper;
 
 /**
  * @internal
diff --git a/src/Middleware/AuthorisationMiddleware.php b/src/Middleware/AuthorisationMiddleware.php
index a9c0658..0eaa2c2 100644
--- a/src/Middleware/AuthorisationMiddleware.php
+++ b/src/Middleware/AuthorisationMiddleware.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Middleware;
+namespace JobRouter\AddOn\RestClient\Middleware;
 
 use Buzz\Middleware\MiddlewareInterface;
 use Psr\Http\Message\RequestInterface;
diff --git a/src/Middleware/UserAgentMiddleware.php b/src/Middleware/UserAgentMiddleware.php
index c8804a7..20e9459 100644
--- a/src/Middleware/UserAgentMiddleware.php
+++ b/src/Middleware/UserAgentMiddleware.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Middleware;
+namespace JobRouter\AddOn\RestClient\Middleware;
 
-use Brotkrueml\JobRouterClient\Information\Version;
 use Buzz\Middleware\MiddlewareInterface;
+use JobRouter\AddOn\RestClient\Information\Version;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/src/Model/Document.php b/src/Model/Document.php
index 3a47fd6..b2c7166 100644
--- a/src/Model/Document.php
+++ b/src/Model/Document.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Model;
+namespace JobRouter\AddOn\RestClient\Model;
 
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
-use Brotkrueml\JobRouterClient\Resource\FileStorage;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Resource\FileStorage;
 
 final class Document
 {
diff --git a/src/Model/Incident.php b/src/Model/Incident.php
index fc093a0..c324e95 100644
--- a/src/Model/Incident.php
+++ b/src/Model/Incident.php
@@ -3,21 +3,19 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Model;
+namespace JobRouter\AddOn\RestClient\Model;
 
-use Brotkrueml\JobRouterClient\Enumerations\Priority;
-use Brotkrueml\JobRouterClient\Exception\InvalidPoolNumberException;
-use Brotkrueml\JobRouterClient\Exception\InvalidStepNumberException;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Enumerations\Priority;
+use JobRouter\AddOn\RestClient\Exception\InvalidPoolNumberException;
+use JobRouter\AddOn\RestClient\Exception\InvalidStepNumberException;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 
 final class Incident
 {
diff --git a/src/Resource/File.php b/src/Resource/File.php
index 28b592b..c5863eb 100644
--- a/src/Resource/File.php
+++ b/src/Resource/File.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Resource;
+namespace JobRouter\AddOn\RestClient\Resource;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidResourceException;
+use JobRouter\AddOn\RestClient\Exception\InvalidResourceException;
 
 /**
  * Value object that represents a file
diff --git a/src/Resource/FileInterface.php b/src/Resource/FileInterface.php
index 9fe5758..9c37dc0 100644
--- a/src/Resource/FileInterface.php
+++ b/src/Resource/FileInterface.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Resource;
+namespace JobRouter\AddOn\RestClient\Resource;
 
 interface FileInterface
 {
diff --git a/src/Resource/FileStorage.php b/src/Resource/FileStorage.php
index dd14611..58b6f48 100644
--- a/src/Resource/FileStorage.php
+++ b/src/Resource/FileStorage.php
@@ -3,16 +3,14 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Resource;
+namespace JobRouter\AddOn\RestClient\Resource;
 
 /**
  * @implements \Iterator<FileInterface>
diff --git a/src/Resource/JobRouterSystem.php b/src/Resource/JobRouterSystem.php
index 7f0ec51..a09cdf7 100644
--- a/src/Resource/JobRouterSystem.php
+++ b/src/Resource/JobRouterSystem.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Resource;
+namespace JobRouter\AddOn\RestClient\Resource;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidUrlException;
+use JobRouter\AddOn\RestClient\Exception\InvalidUrlException;
 
 /**
  * Value object that represents a JobRouter system
diff --git a/tests/Unit/Client/ClientDecoratorTest.php b/tests/Unit/Client/ClientDecoratorTest.php
index 0bd1dd2..88ebd83 100644
--- a/tests/Unit/Client/ClientDecoratorTest.php
+++ b/tests/Unit/Client/ClientDecoratorTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Client;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Client;
 
-use Brotkrueml\JobRouterClient\Client\ClientDecorator;
-use Brotkrueml\JobRouterClient\Client\ClientInterface;
+use JobRouter\AddOn\RestClient\Client\ClientDecorator;
+use JobRouter\AddOn\RestClient\Client\ClientInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Client/ClientFactoryTest.php b/tests/Unit/Client/ClientFactoryTest.php
index 1e409e9..395fd2b 100644
--- a/tests/Unit/Client/ClientFactoryTest.php
+++ b/tests/Unit/Client/ClientFactoryTest.php
@@ -3,24 +3,22 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Client;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Client;
 
-use Brotkrueml\JobRouterClient\Client\ClientFactory;
-use Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator;
-use Brotkrueml\JobRouterClient\Client\IncidentsClientDecorator;
-use Brotkrueml\JobRouterClient\Client\RestClient;
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
 use donatj\MockWebServer\MockWebServer;
 use donatj\MockWebServer\Response;
+use JobRouter\AddOn\RestClient\Client\ClientFactory;
+use JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator;
+use JobRouter\AddOn\RestClient\Client\IncidentsClientDecorator;
+use JobRouter\AddOn\RestClient\Client\RestClient;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Client/DocumentsClientDecoratorTest.php b/tests/Unit/Client/DocumentsClientDecoratorTest.php
index 6152370..de90f8d 100644
--- a/tests/Unit/Client/DocumentsClientDecoratorTest.php
+++ b/tests/Unit/Client/DocumentsClientDecoratorTest.php
@@ -3,21 +3,19 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Client;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Client;
 
-use Brotkrueml\JobRouterClient\Client\ClientInterface;
-use Brotkrueml\JobRouterClient\Client\DocumentsClientDecorator;
-use Brotkrueml\JobRouterClient\Model\Document;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Client\ClientInterface;
+use JobRouter\AddOn\RestClient\Client\DocumentsClientDecorator;
+use JobRouter\AddOn\RestClient\Model\Document;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Client/IncidentsClientDecoratorTest.php b/tests/Unit/Client/IncidentsClientDecoratorTest.php
index 68a3da3..a6a7916 100644
--- a/tests/Unit/Client/IncidentsClientDecoratorTest.php
+++ b/tests/Unit/Client/IncidentsClientDecoratorTest.php
@@ -3,22 +3,20 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Client;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Client;
 
-use Brotkrueml\JobRouterClient\Client\ClientInterface;
-use Brotkrueml\JobRouterClient\Client\IncidentsClientDecorator;
-use Brotkrueml\JobRouterClient\Enumerations\Priority;
-use Brotkrueml\JobRouterClient\Model\Incident;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Client\ClientInterface;
+use JobRouter\AddOn\RestClient\Client\IncidentsClientDecorator;
+use JobRouter\AddOn\RestClient\Enumerations\Priority;
+use JobRouter\AddOn\RestClient\Model\Incident;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/Unit/Client/RestClientTest.php b/tests/Unit/Client/RestClientTest.php
index 0734ac0..2482a04 100644
--- a/tests/Unit/Client/RestClientTest.php
+++ b/tests/Unit/Client/RestClientTest.php
@@ -3,26 +3,24 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Client;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Client;
 
-use Brotkrueml\JobRouterClient\Client\RestClient;
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-use Brotkrueml\JobRouterClient\Configuration\ClientOptions;
-use Brotkrueml\JobRouterClient\Exception\AuthenticationException;
-use Brotkrueml\JobRouterClient\Exception\HttpException;
-use Brotkrueml\JobRouterClient\Exception\RestClientException;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
 use donatj\MockWebServer\MockWebServer;
 use donatj\MockWebServer\Response;
+use JobRouter\AddOn\RestClient\Client\RestClient;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Configuration\ClientOptions;
+use JobRouter\AddOn\RestClient\Exception\AuthenticationException;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
+use JobRouter\AddOn\RestClient\Exception\RestClientException;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Configuration/ClientConfigurationTest.php b/tests/Unit/Configuration/ClientConfigurationTest.php
index fbadcb7..2a4c440 100644
--- a/tests/Unit/Configuration/ClientConfigurationTest.php
+++ b/tests/Unit/Configuration/ClientConfigurationTest.php
@@ -3,20 +3,18 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Configuration;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Configuration;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-use Brotkrueml\JobRouterClient\Configuration\ClientOptions;
-use Brotkrueml\JobRouterClient\Exception\InvalidConfigurationException;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Configuration\ClientOptions;
+use JobRouter\AddOn\RestClient\Exception\InvalidConfigurationException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Configuration/ClientOptionsTest.php b/tests/Unit/Configuration/ClientOptionsTest.php
index c04f5d4..1cb8078 100644
--- a/tests/Unit/Configuration/ClientOptionsTest.php
+++ b/tests/Unit/Configuration/ClientOptionsTest.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Configuration;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Configuration;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientOptions;
+use JobRouter\AddOn\RestClient\Configuration\ClientOptions;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Exception/AuthenticationExceptionTest.php b/tests/Unit/Exception/AuthenticationExceptionTest.php
index b3207a7..84e4915 100644
--- a/tests/Unit/Exception/AuthenticationExceptionTest.php
+++ b/tests/Unit/Exception/AuthenticationExceptionTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Exception;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Exception;
 
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-use Brotkrueml\JobRouterClient\Exception\AuthenticationException;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Exception\AuthenticationException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Exception/HttpExceptionTest.php b/tests/Unit/Exception/HttpExceptionTest.php
index a3ae4bc..88d9098 100644
--- a/tests/Unit/Exception/HttpExceptionTest.php
+++ b/tests/Unit/Exception/HttpExceptionTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Exception;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Exception;
 
-use Brotkrueml\JobRouterClient\Exception\HttpException;
 use Buzz\Exception\ClientException;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Exception/InvalidPoolNumberExceptionTest.php b/tests/Unit/Exception/InvalidPoolNumberExceptionTest.php
index 462bbd9..29310d6 100644
--- a/tests/Unit/Exception/InvalidPoolNumberExceptionTest.php
+++ b/tests/Unit/Exception/InvalidPoolNumberExceptionTest.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Exception;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Exception;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidPoolNumberException;
+use JobRouter\AddOn\RestClient\Exception\InvalidPoolNumberException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Exception/InvalidStepNumberExceptionTest.php b/tests/Unit/Exception/InvalidStepNumberExceptionTest.php
index 36610dc..a90730f 100644
--- a/tests/Unit/Exception/InvalidStepNumberExceptionTest.php
+++ b/tests/Unit/Exception/InvalidStepNumberExceptionTest.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Exception;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Exception;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidStepNumberException;
+use JobRouter\AddOn\RestClient\Exception\InvalidStepNumberException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Mapper/RouteContentTypeMapperTest.php b/tests/Unit/Mapper/RouteContentTypeMapperTest.php
index a9aac3b..8fdb1a4 100644
--- a/tests/Unit/Mapper/RouteContentTypeMapperTest.php
+++ b/tests/Unit/Mapper/RouteContentTypeMapperTest.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Mapper;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Mapper;
 
-use Brotkrueml\JobRouterClient\Mapper\RouteContentTypeMapper;
+use JobRouter\AddOn\RestClient\Mapper\RouteContentTypeMapper;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Middleware/AuthorisationMiddlewareTest.php b/tests/Unit/Middleware/AuthorisationMiddlewareTest.php
index 5aae2e2..79fe405 100644
--- a/tests/Unit/Middleware/AuthorisationMiddlewareTest.php
+++ b/tests/Unit/Middleware/AuthorisationMiddlewareTest.php
@@ -3,18 +3,16 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Middleware;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Middleware;
 
-use Brotkrueml\JobRouterClient\Middleware\AuthorisationMiddleware;
+use JobRouter\AddOn\RestClient\Middleware\AuthorisationMiddleware;
 use Nyholm\Psr7\Request;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Middleware/UserAgentMiddlewareTest.php b/tests/Unit/Middleware/UserAgentMiddlewareTest.php
index e4cd802..fdb591a 100644
--- a/tests/Unit/Middleware/UserAgentMiddlewareTest.php
+++ b/tests/Unit/Middleware/UserAgentMiddlewareTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Middleware;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Middleware;
 
-use Brotkrueml\JobRouterClient\Information\Version;
-use Brotkrueml\JobRouterClient\Middleware\UserAgentMiddleware;
+use JobRouter\AddOn\RestClient\Information\Version;
+use JobRouter\AddOn\RestClient\Middleware\UserAgentMiddleware;
 use Nyholm\Psr7\Request;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Model/DocumentTest.php b/tests/Unit/Model/DocumentTest.php
index 299769c..7155ff2 100644
--- a/tests/Unit/Model/DocumentTest.php
+++ b/tests/Unit/Model/DocumentTest.php
@@ -3,20 +3,18 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Model;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Model;
 
-use Brotkrueml\JobRouterClient\Model\Document;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
-use Brotkrueml\JobRouterClient\Resource\FileStorage;
+use JobRouter\AddOn\RestClient\Model\Document;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Resource\FileStorage;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Model/IncidentTest.php b/tests/Unit/Model/IncidentTest.php
index 04649c4..79b9cab 100644
--- a/tests/Unit/Model/IncidentTest.php
+++ b/tests/Unit/Model/IncidentTest.php
@@ -3,22 +3,20 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Model;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Model;
 
-use Brotkrueml\JobRouterClient\Enumerations\Priority;
-use Brotkrueml\JobRouterClient\Exception\InvalidPoolNumberException;
-use Brotkrueml\JobRouterClient\Exception\InvalidStepNumberException;
-use Brotkrueml\JobRouterClient\Model\Incident;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Enumerations\Priority;
+use JobRouter\AddOn\RestClient\Exception\InvalidPoolNumberException;
+use JobRouter\AddOn\RestClient\Exception\InvalidStepNumberException;
+use JobRouter\AddOn\RestClient\Model\Incident;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Resource/FileStorageTest.php b/tests/Unit/Resource/FileStorageTest.php
index 3dbda46..0c607c9 100644
--- a/tests/Unit/Resource/FileStorageTest.php
+++ b/tests/Unit/Resource/FileStorageTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Resource;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Resource;
 
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
-use Brotkrueml\JobRouterClient\Resource\FileStorage;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Resource\FileStorage;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Resource/FileTest.php b/tests/Unit/Resource/FileTest.php
index 37e8fce..c731e0a 100644
--- a/tests/Unit/Resource/FileTest.php
+++ b/tests/Unit/Resource/FileTest.php
@@ -3,20 +3,18 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Resource;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Resource;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidResourceException;
-use Brotkrueml\JobRouterClient\Resource\File;
-use Brotkrueml\JobRouterClient\Resource\FileInterface;
+use JobRouter\AddOn\RestClient\Exception\InvalidResourceException;
+use JobRouter\AddOn\RestClient\Resource\File;
+use JobRouter\AddOn\RestClient\Resource\FileInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Resource/JobRouterSystemTest.php b/tests/Unit/Resource/JobRouterSystemTest.php
index 39a173a..f2f8506 100644
--- a/tests/Unit/Resource/JobRouterSystemTest.php
+++ b/tests/Unit/Resource/JobRouterSystemTest.php
@@ -3,19 +3,17 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the JobRouter Client.
- * https://github.com/brotkrueml/jobrouter-client
- *
- * Copyright (c) 2019-2023 Chris Müller
+ * This file is part of the JobRouter REST Client.
+ * https://github.com/jobrouter/php-rest-client
  *
  * For the full copyright and license information, please view the
  * LICENSE.txt file that was distributed with this source code.
  */
 
-namespace Brotkrueml\JobRouterClient\Tests\Unit\Resource;
+namespace JobRouter\AddOn\RestClient\Tests\Unit\Resource;
 
-use Brotkrueml\JobRouterClient\Exception\InvalidUrlException;
-use Brotkrueml\JobRouterClient\Resource\JobRouterSystem;
+use JobRouter\AddOn\RestClient\Exception\InvalidUrlException;
+use JobRouter\AddOn\RestClient\Resource\JobRouterSystem;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;