diff --git a/README.md b/README.md
index 95adaf05d1df9f59b6b2d53b2134f534edbdf0a4..fa55e895be80b9a4b3e155c5bb67209456f83bc7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ composer require dbp/api-base-bundle
 
 ```php
 ...
-DBP\API\BaseBundle\DbpBaseBundle::class => ['all' => true],
+Dbp\Relay\BaseBundle\DbpRelayBaseBundle::class => ['all' => true],
 DBP\API\CoreBundle\DbpCoreBundle::class => ['all' => true],
 ];
 ```
diff --git a/composer.json b/composer.json
index c83eb0fcbab23d1e59ea3bc7a8ac20737138b35b..aa02e1b4358cdc0b9f59c59876325a597ae39b05 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "dbp/api-base-bundle",
+    "name": "dbp/relay-base-bundle",
     "type": "symfony-bundle",
     "license": "AGPL-3.0-or-later",
     "require": {
@@ -32,12 +32,12 @@
     },
     "autoload": {
         "psr-4": {
-            "DBP\\API\\BaseBundle\\": "src/"
+            "Dbp\\Relay\\BaseBundle\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-          "DBP\\API\\BaseBundle\\Tests\\": "tests/"
+          "Dbp\\Relay\\BaseBundle\\Tests\\": "tests/"
         }
     },
     "config": {
diff --git a/composer.lock b/composer.lock
index c7be636d618d2afb2c47bc5a486ea252b52fd22d..339de56bb08c26eb8c72362b83eca89bf6454ca5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2cd489c238235dc4f2259cf92594c168",
+    "content-hash": "412a6debb11df123e57bd8a615074b4b",
     "packages": [
         {
             "name": "api-platform/core",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 42626c13bc0cb6e4132ac3712628ef9c77a7b56b..0d0c4dfb42ac3ae5301ca2bb057ba4d54eda46d7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,7 @@
     <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
     <server name="SYMFONY_PHPUNIT_VERSION" value="9"/>
     <server name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
-    <server name="KERNEL_CLASS" value="DBP\API\BaseBundle\Tests\Kernel"/>
+    <server name="KERNEL_CLASS" value="Dbp\Relay\BaseBundle\Tests\Kernel"/>
   </php>
   <testsuites>
     <testsuite name="Project Test Suite">
diff --git a/src/API/OrganizationProviderInterface.php b/src/API/OrganizationProviderInterface.php
index ae636216df62101e32f34cbf016dc63761914d2e..61652dcc0bd4616805129ee2b5d677caf9f8bb4e 100644
--- a/src/API/OrganizationProviderInterface.php
+++ b/src/API/OrganizationProviderInterface.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\API;
+namespace Dbp\Relay\BaseBundle\API;
 
-use DBP\API\BaseBundle\Entity\Organization;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\Entity\Organization;
+use Dbp\Relay\BaseBundle\Entity\Person;
 
 interface OrganizationProviderInterface
 {
diff --git a/src/API/PersonProviderInterface.php b/src/API/PersonProviderInterface.php
index dde3d3b9a3ed85b0fa04ec70351ca58e1516872e..12b1f91539c9735e7f109d20bb09923c4dbd4464 100644
--- a/src/API/PersonProviderInterface.php
+++ b/src/API/PersonProviderInterface.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\API;
+namespace Dbp\Relay\BaseBundle\API;
 
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\Entity\Person;
 
 interface PersonProviderInterface
 {
diff --git a/src/Controller/GetOrganizationsByPerson.php b/src/Controller/GetOrganizationsByPerson.php
index 3b90b82757265994653eacdb826f06f03843cbfd..20304d395d6b904873b03d546d82ed8c85225b48 100644
--- a/src/Controller/GetOrganizationsByPerson.php
+++ b/src/Controller/GetOrganizationsByPerson.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Controller;
+namespace Dbp\Relay\BaseBundle\Controller;
 
 use ApiPlatform\Core\DataProvider\PaginatorInterface;
-use DBP\API\BaseBundle\API\OrganizationProviderInterface;
-use DBP\API\BaseBundle\API\PersonProviderInterface;
+use Dbp\Relay\BaseBundle\API\OrganizationProviderInterface;
+use Dbp\Relay\BaseBundle\API\PersonProviderInterface;
 use Dbp\Relay\CoreBundle\Exception\ApiError;
 use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/DataProvider/OrganizationCollectionDataProvider.php b/src/DataProvider/OrganizationCollectionDataProvider.php
index 5914f156c1463af1c6d95491f191ae76fd9cfc41..94946b184b718a64cb53d96698d8e30b6aff9c3f 100644
--- a/src/DataProvider/OrganizationCollectionDataProvider.php
+++ b/src/DataProvider/OrganizationCollectionDataProvider.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DataProvider;
+namespace Dbp\Relay\BaseBundle\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use DBP\API\BaseBundle\API\OrganizationProviderInterface;
-use DBP\API\BaseBundle\Entity\Organization;
+use Dbp\Relay\BaseBundle\API\OrganizationProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Organization;
 use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
diff --git a/src/DataProvider/OrganizationDataProvider.php b/src/DataProvider/OrganizationDataProvider.php
index 6f0df8cc9ddf3014db3d6679d533944062c3c622..05f4bb1ad22fb0d7cf860f8bc7928fc7432c366a 100644
--- a/src/DataProvider/OrganizationDataProvider.php
+++ b/src/DataProvider/OrganizationDataProvider.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DataProvider;
+namespace Dbp\Relay\BaseBundle\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use DBP\API\BaseBundle\API\OrganizationProviderInterface;
-use DBP\API\BaseBundle\Entity\Organization;
+use Dbp\Relay\BaseBundle\API\OrganizationProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Organization;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 final class OrganizationDataProvider extends AbstractController implements ItemDataProviderInterface, RestrictedDataProviderInterface
diff --git a/src/DataProvider/PersonCollectionDataProvider.php b/src/DataProvider/PersonCollectionDataProvider.php
index 921365ec30e9dc5da4a7de8d21001f644b2ca405..af6d67191fd48a041d15c10573ee6c48b5de6892 100644
--- a/src/DataProvider/PersonCollectionDataProvider.php
+++ b/src/DataProvider/PersonCollectionDataProvider.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DataProvider;
+namespace Dbp\Relay\BaseBundle\DataProvider;
 
 use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use DBP\API\BaseBundle\API\PersonProviderInterface;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\API\PersonProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Person;
 use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
diff --git a/src/DataProvider/PersonItemDataProvider.php b/src/DataProvider/PersonItemDataProvider.php
index 1e60e8e1a1e594d9145557c50b2ccbe3b676648b..dac2f64db2b26f281b6d0149f9d6037d50987ce4 100644
--- a/src/DataProvider/PersonItemDataProvider.php
+++ b/src/DataProvider/PersonItemDataProvider.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DataProvider;
+namespace Dbp\Relay\BaseBundle\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use DBP\API\BaseBundle\API\PersonProviderInterface;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\API\PersonProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Person;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 final class PersonItemDataProvider extends AbstractController implements ItemDataProviderInterface, RestrictedDataProviderInterface
diff --git a/src/DbpBaseBundle.php b/src/DbpRelayBaseBundle.php
similarity index 74%
rename from src/DbpBaseBundle.php
rename to src/DbpRelayBaseBundle.php
index 0415050e97fd0e6973b927290c3d7be2de8362ca..13da1f87ab06cec541e317ac451c9a0dff355219 100644
--- a/src/DbpBaseBundle.php
+++ b/src/DbpRelayBaseBundle.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle;
+namespace Dbp\Relay\BaseBundle;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class DbpBaseBundle extends Bundle
+class DbpRelayBaseBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index c3a2e07cb4ee6afdd6b2de4eb1bd6fa4b11e1578..fc9b320ad627bf469a3d6593fb937f34155d3d64 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DependencyInjection;
+namespace Dbp\Relay\BaseBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -11,7 +11,7 @@ class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('dbp_base');
+        $treeBuilder = new TreeBuilder('dbp_relay_base');
 
         return $treeBuilder;
     }
diff --git a/src/DependencyInjection/DbpBaseExtension.php b/src/DependencyInjection/DbpRelayBaseExtension.php
similarity index 90%
rename from src/DependencyInjection/DbpBaseExtension.php
rename to src/DependencyInjection/DbpRelayBaseExtension.php
index 7c5798bf81a1bb5b303718a7199f07bd8dcc85c9..c0025d99b76bf9d70ca985cce78cfa9ba2b65870 100644
--- a/src/DependencyInjection/DbpBaseExtension.php
+++ b/src/DependencyInjection/DbpRelayBaseExtension.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\DependencyInjection;
+namespace Dbp\Relay\BaseBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;
 
-class DbpBaseExtension extends ConfigurableExtension
+class DbpRelayBaseExtension extends ConfigurableExtension
 {
     public function loadInternal(array $mergedConfig, ContainerBuilder $container)
     {
diff --git a/src/Entity/Organization.php b/src/Entity/Organization.php
index ea91877bb6be3a27633b2803dac08ff4cc92567a..7aef452ba7c355c6b6577ba9d847bf4a693d55fe 100644
--- a/src/Entity/Organization.php
+++ b/src/Entity/Organization.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Entity;
+namespace Dbp\Relay\BaseBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;
-use DBP\API\BaseBundle\Controller\GetOrganizationsByPerson;
+use Dbp\Relay\BaseBundle\Controller\GetOrganizationsByPerson;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
diff --git a/src/Entity/Person.php b/src/Entity/Person.php
index d7bbc7b59dbdc9a1076de3b5d6bb186e1a4cd5ee..c205e83eec8c996042eb1a9d354886b2dba7d5f4 100644
--- a/src/Entity/Person.php
+++ b/src/Entity/Person.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Entity;
+namespace Dbp\Relay\BaseBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
 
@@ -31,7 +31,7 @@ use ApiPlatform\Core\Annotation\ApiResource;
  *     iri="http://schema.org/Person",
  *     description="A person of the LDAP system",
  *     normalizationContext={
- *         "groups" = {"Person:output"},
+ *         "groups" = {"BasePerson:output"},
  *         "jsonld_embed_context" = true,
  *     }
  * )
diff --git a/src/Entity/PersonTrait.php b/src/Entity/PersonTrait.php
index 1e8c667fa9249d467e6922bffb57690cf2a73432..8dd10405274707f28f241482a51cb0a1acbd9e14 100644
--- a/src/Entity/PersonTrait.php
+++ b/src/Entity/PersonTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Entity;
+namespace Dbp\Relay\BaseBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -11,7 +11,7 @@ trait PersonTrait
 {
     /**
      * @ApiProperty(identifier=true)
-     * @Groups({"Person:output"})
+     * @Groups({"BasePerson:output"})
      *
      * @var string
      */
@@ -19,7 +19,7 @@ trait PersonTrait
 
     /**
      * @ApiProperty(iri="http://schema.org/givenName")
-     * @Groups({"Person:output"})
+     * @Groups({"BasePerson:output"})
      *
      * @var string
      */
@@ -28,7 +28,7 @@ trait PersonTrait
     /**
      * @var string
      * @ApiProperty(iri="http://schema.org/familyName")
-     * @Groups({"Person:output"})
+     * @Groups({"BasePerson:output"})
      *
      * @var string
      */
@@ -36,7 +36,7 @@ trait PersonTrait
 
     /**
      * @ApiProperty(iri="http://schema.org/email")
-     * @Groups({"Person:current-user", "Person:extended-access"})
+     * @Groups({"BasePerson:current-user", "BasePerson:extended-access"})
      *
      * @var string
      */
@@ -44,14 +44,14 @@ trait PersonTrait
 
     /**
      * @var array
-     * @Groups({"Person:current-user"})
+     * @Groups({"BasePerson:current-user"})
      */
     private $roles;
 
     /**
      * @var string
      * @ApiProperty(iri="http://schema.org/birthDate")
-     * @Groups({"Person:current-user"})
+     * @Groups({"BasePerson:current-user"})
      */
     private $birthDate;
 
@@ -127,7 +127,7 @@ trait PersonTrait
 
     /**
      * @ApiProperty(iri="http://schema.org/name")
-     * @Groups({"Person:output"})
+     * @Groups({"BasePerson:output"})
      */
     public function getName(): ?string
     {
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index 659f546a9724d22bf416296a3676bd8fe4cbb1e8..294ddb3d726431e88d007c03039da5856b60395d 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -1,33 +1,33 @@
 services:
-  DBP\API\BaseBundle\Controller\:
+  Dbp\Relay\BaseBundle\Controller\:
     resource: '../../Controller'
     autowire: true
     autoconfigure: true
 
-  DBP\API\BaseBundle\API\OrganizationProviderInterface:
-    '@DBP\API\BaseBundle\Service\DummyOrganizationProvider'
+  Dbp\Relay\BaseBundle\API\OrganizationProviderInterface:
+    '@Dbp\Relay\BaseBundle\Service\DummyOrganizationProvider'
 
-  DBP\API\BaseBundle\Service\DummyOrganizationProvider:
+  Dbp\Relay\BaseBundle\Service\DummyOrganizationProvider:
     autowire: true
     autoconfigure: true
 
-  DBP\API\BaseBundle\Service\DummyPersonProvider:
+  Dbp\Relay\BaseBundle\Service\DummyPersonProvider:
     autowire: true
     autoconfigure: true
 
-  DBP\API\BaseBundle\API\PersonProviderInterface:
-    '@DBP\API\BaseBundle\Service\DummyPersonProvider'
+  Dbp\Relay\BaseBundle\API\PersonProviderInterface:
+    '@Dbp\Relay\BaseBundle\Service\DummyPersonProvider'
 
-  DBP\API\BaseBundle\DataProvider\:
+  Dbp\Relay\BaseBundle\DataProvider\:
     resource: '../../DataProvider'
     autowire: true
     autoconfigure: true
 
-  DBP\API\BaseBundle\Serializer\PersonAttributeNormalizer:
+  Dbp\Relay\BaseBundle\Serializer\PersonAttributeNormalizer:
     autowire: true
     autoconfigure: true
 
   # This alias exist so we can replace the service during tests
   test.PersonProviderInterface:
-    alias: 'DBP\API\BaseBundle\API\PersonProviderInterface'
+    alias: 'Dbp\Relay\BaseBundle\API\PersonProviderInterface'
     public: true
diff --git a/src/Serializer/PersonAttributeNormalizer.php b/src/Serializer/PersonAttributeNormalizer.php
index 8868d6925631906e20bc96f0b409f6cb59717a26..66c088eaffafc7e6436e1025cbf571af5acf4fae 100644
--- a/src/Serializer/PersonAttributeNormalizer.php
+++ b/src/Serializer/PersonAttributeNormalizer.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Serializer;
+namespace Dbp\Relay\BaseBundle\Serializer;
 
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\Entity\Person;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
@@ -30,7 +30,7 @@ class PersonAttributeNormalizer implements ContextAwareNormalizerInterface, Norm
     {
         // set the group "Person:current-user" for the current user
         if ($this->isCurrentUser($object)) {
-            $context['groups'][] = 'Person:current-user';
+            $context['groups'][] = 'BasePerson:current-user';
         }
 
         $context[self::ALREADY_CALLED] = true;
diff --git a/src/Service/DummyOrganizationProvider.php b/src/Service/DummyOrganizationProvider.php
index 0095b62151fa2be238fdc742b7b4818dc3badda9..dc6766d570a106173c8eda0d0775704163cef5bf 100644
--- a/src/Service/DummyOrganizationProvider.php
+++ b/src/Service/DummyOrganizationProvider.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Service;
+namespace Dbp\Relay\BaseBundle\Service;
 
-use DBP\API\BaseBundle\API\OrganizationProviderInterface;
-use DBP\API\BaseBundle\Entity\Organization;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\API\OrganizationProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Organization;
+use Dbp\Relay\BaseBundle\Entity\Person;
 
 class DummyOrganizationProvider implements OrganizationProviderInterface
 {
diff --git a/src/Service/DummyPersonProvider.php b/src/Service/DummyPersonProvider.php
index da277160652a446131650faf364ab36dad3d93c0..c3641ff3324bbd2d87d1d640150e03d0f3345cca 100644
--- a/src/Service/DummyPersonProvider.php
+++ b/src/Service/DummyPersonProvider.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Service;
+namespace Dbp\Relay\BaseBundle\Service;
 
-use DBP\API\BaseBundle\API\PersonProviderInterface;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\API\PersonProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Person;
 
 class DummyPersonProvider implements PersonProviderInterface
 {
diff --git a/src/TestUtils/DummyPersonProvider.php b/src/TestUtils/DummyPersonProvider.php
index bddcf27a8e508d2c52c78b01f51315687a19691b..81c0d5c59b2c009ca0c533de236bc3903be1caba 100644
--- a/src/TestUtils/DummyPersonProvider.php
+++ b/src/TestUtils/DummyPersonProvider.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\TestUtils;
+namespace Dbp\Relay\BaseBundle\TestUtils;
 
 use ApiPlatform\Core\Exception\ItemNotFoundException;
-use DBP\API\BaseBundle\API\PersonProviderInterface;
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\API\PersonProviderInterface;
+use Dbp\Relay\BaseBundle\Entity\Person;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class DummyPersonProvider implements PersonProviderInterface
diff --git a/tests/ExtTest.php b/tests/ExtTest.php
index 20bdd6fafa5632fc508430f1db7daf8bd36b198e..8ceeed2a68c3c00338e528fbffebb1f7ba14c155 100644
--- a/tests/ExtTest.php
+++ b/tests/ExtTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Tests;
+namespace Dbp\Relay\BaseBundle\Tests;
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client;
-use DBP\API\BaseBundle\Entity\Person;
-use DBP\API\BaseBundle\TestUtils\DummyPersonProvider;
+use Dbp\Relay\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\TestUtils\DummyPersonProvider;
 use Dbp\Relay\CoreBundle\TestUtils\UserAuthTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/tests/Kernel.php b/tests/Kernel.php
index 04b23805483f98f9ed61bb666a4c0c2dc9d8a1c6..a3d2e08800ec2c710f31fb7d95518479f0dad0de 100644
--- a/tests/Kernel.php
+++ b/tests/Kernel.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Tests;
+namespace Dbp\Relay\BaseBundle\Tests;
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle;
-use DBP\API\BaseBundle\DbpBaseBundle;
+use Dbp\Relay\BaseBundle\DbpRelayBaseBundle;
 use Dbp\Relay\CoreBundle\DbpRelayCoreBundle;
 use Nelmio\CorsBundle\NelmioCorsBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -29,7 +29,7 @@ class Kernel extends BaseKernel
         yield new NelmioCorsBundle();
         yield new MonologBundle();
         yield new ApiPlatformBundle();
-        yield new DbpBaseBundle();
+        yield new DbpRelayBaseBundle();
         yield new DbpRelayCoreBundle();
     }
 
diff --git a/tests/PersonTest.php b/tests/PersonTest.php
index 573fcad126708e5f51a5b7dea649c933284f9348..c9eae118f00a58fefb96b0c594a18fe047d6a3b9 100644
--- a/tests/PersonTest.php
+++ b/tests/PersonTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DBP\API\BaseBundle\Tests;
+namespace Dbp\Relay\BaseBundle\Tests;
 
-use DBP\API\BaseBundle\Entity\Person;
+use Dbp\Relay\BaseBundle\Entity\Person;
 use PHPUnit\Framework\TestCase;
 
 class PersonTest extends TestCase