diff --git a/composer.json b/composer.json
index 1c539c3..020d2a8 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,7 @@
   },
   "autoload": {
     "psr-4": {
-      "MummertMedia\\EventManagerBundle\\": "src/",
-      "Mummert\\EventManagerBundle\\": "src/Compat/"
+      "Mummert\\EventManagerBundle\\": "src/"
     }
   },
   "extra": {
diff --git a/config/services.yaml b/config/services.yaml
index b10c90e..1a1325c 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -3,16 +3,16 @@ services:
     autowire: true
     autoconfigure: true
 
-  MummertMedia\EventManagerBundle\:
+  Mummert\EventManagerBundle\:
     resource: ../src/
     exclude:
       - ../src/DependencyInjection/
       - ../src/Contao/Manager/
-      - ../src/MummertMediaEventManagerBundle.php
+      - ../src/EventManagerBundle.php
 
-  MummertMedia\EventManagerBundle\EventListener\DataContainer\SetDateAddedCallback:
+  Mummert\EventManagerBundle\EventListener\DataContainer\SetDateAddedCallback:
     tags:
       - { name: contao.callback, table: tl_organization, target: config.onbeforesubmit, method: onBeforeSubmit }
       - { name: contao.callback, table: tl_location, target: config.onbeforesubmit, method: onBeforeSubmit }
 
-  MummertMedia\EventManagerBundle\Service\MapModuleDataProvider: ~
+  Mummert\EventManagerBundle\Service\MapModuleDataProvider: ~
diff --git a/contao/config/config.php b/contao/config/config.php
index de50643..c829626 100644
--- a/contao/config/config.php
+++ b/contao/config/config.php
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-$GLOBALS['TL_MODELS']['tl_organization'] = MummertMedia\EventManagerBundle\Model\OrganizationModel::class;
-$GLOBALS['TL_MODELS']['tl_location'] = MummertMedia\EventManagerBundle\Model\LocationModel::class;
+$GLOBALS['TL_MODELS']['tl_organization'] = Mummert\EventManagerBundle\Model\OrganizationModel::class;
+$GLOBALS['TL_MODELS']['tl_location'] = Mummert\EventManagerBundle\Model\LocationModel::class;
 
 $GLOBALS['BE_MOD']['content']['eventmanager_organisationen'] = [
     'tables' => ['tl_organization'],
diff --git a/src/Compat/Contao/Manager/Plugin.php b/src/Compat/Contao/Manager/Plugin.php
deleted file mode 100644
index a95980c..0000000
--- a/src/Compat/Contao/Manager/Plugin.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mummert\EventManagerBundle\Contao\Manager;
-
-use Contao\CalendarBundle\ContaoCalendarBundle;
-use Contao\CoreBundle\ContaoCoreBundle;
-use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
-use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
-use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
-use Mummert\EventManagerBundle\EventManagerBundle;
-
-class Plugin implements BundlePluginInterface
-{
-    public function getBundles(ParserInterface $parser): iterable
-    {
-        return [
-            BundleConfig::create(EventManagerBundle::class)
-                ->setLoadAfter([ContaoCoreBundle::class, ContaoCalendarBundle::class]),
-        ];
-    }
-}
diff --git a/src/Compat/EventManagerBundle.php b/src/Compat/EventManagerBundle.php
deleted file mode 100644
index d4fbe91..0000000
--- a/src/Compat/EventManagerBundle.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mummert\EventManagerBundle;
-
-use MummertMedia\EventManagerBundle\MummertMediaEventManagerBundle;
-
-class EventManagerBundle extends MummertMediaEventManagerBundle
-{
-}
diff --git a/src/Contao/Manager/Plugin.php b/src/Contao/Manager/Plugin.php
index a638b85..a95980c 100644
--- a/src/Contao/Manager/Plugin.php
+++ b/src/Contao/Manager/Plugin.php
@@ -2,21 +2,21 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Contao\Manager;
+namespace Mummert\EventManagerBundle\Contao\Manager;
 
 use Contao\CalendarBundle\ContaoCalendarBundle;
 use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
-use MummertMedia\EventManagerBundle\MummertMediaEventManagerBundle;
+use Mummert\EventManagerBundle\EventManagerBundle;
 
 class Plugin implements BundlePluginInterface
 {
     public function getBundles(ParserInterface $parser): iterable
     {
         return [
-            BundleConfig::create(MummertMediaEventManagerBundle::class)
+            BundleConfig::create(EventManagerBundle::class)
                 ->setLoadAfter([ContaoCoreBundle::class, ContaoCalendarBundle::class]),
         ];
     }
diff --git a/src/Controller/Frontend/EventEditController.php b/src/Controller/Frontend/EventEditController.php
index eebddcf..c0f6f08 100644
--- a/src/Controller/Frontend/EventEditController.php
+++ b/src/Controller/Frontend/EventEditController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
@@ -13,8 +13,8 @@ use Contao\FrontendUser;
 use Contao\ModuleModel;
 use Contao\PageModel;
 use Contao\StringUtil;
-use MummertMedia\EventManagerBundle\Form\EventType;
-use MummertMedia\EventManagerBundle\Service\EventRepository;
+use Mummert\EventManagerBundle\Form\EventType;
+use Mummert\EventManagerBundle\Service\EventRepository;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
diff --git a/src/Controller/Frontend/EventFilterController.php b/src/Controller/Frontend/EventFilterController.php
index 1fabfe1..4a65658 100644
--- a/src/Controller/Frontend/EventFilterController.php
+++ b/src/Controller/Frontend/EventFilterController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
diff --git a/src/Controller/Frontend/EventMapController.php b/src/Controller/Frontend/EventMapController.php
index 5da0c9f..dfd87be 100644
--- a/src/Controller/Frontend/EventMapController.php
+++ b/src/Controller/Frontend/EventMapController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
@@ -10,7 +10,7 @@ use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\ModuleModel;
 use Contao\PageModel;
 use Contao\StringUtil;
-use MummertMedia\EventManagerBundle\Service\MapModuleDataProvider;
+use Mummert\EventManagerBundle\Service\MapModuleDataProvider;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/Controller/Frontend/MemberEventsController.php b/src/Controller/Frontend/MemberEventsController.php
index 9c70921..3d7737b 100644
--- a/src/Controller/Frontend/MemberEventsController.php
+++ b/src/Controller/Frontend/MemberEventsController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
@@ -11,7 +11,7 @@ use Contao\FrontendUser;
 use Contao\ModuleModel;
 use Contao\PageModel;
 use Contao\StringUtil;
-use MummertMedia\EventManagerBundle\Service\EventRepository;
+use Mummert\EventManagerBundle\Service\EventRepository;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Controller/Frontend/MemberOrganizationsController.php b/src/Controller/Frontend/MemberOrganizationsController.php
index e70d7f1..d14605c 100644
--- a/src/Controller/Frontend/MemberOrganizationsController.php
+++ b/src/Controller/Frontend/MemberOrganizationsController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
@@ -11,7 +11,7 @@ use Contao\FrontendUser;
 use Contao\ModuleModel;
 use Contao\PageModel;
 use Contao\StringUtil;
-use MummertMedia\EventManagerBundle\Service\OrganizationRepository;
+use Mummert\EventManagerBundle\Service\OrganizationRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/Controller/Frontend/OrganizationEditController.php b/src/Controller/Frontend/OrganizationEditController.php
index a8cabcc..9fbe303 100644
--- a/src/Controller/Frontend/OrganizationEditController.php
+++ b/src/Controller/Frontend/OrganizationEditController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+namespace Mummert\EventManagerBundle\Controller\Frontend;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
@@ -13,8 +13,8 @@ use Contao\FrontendUser;
 use Contao\ModuleModel;
 use Contao\PageModel;
 use Contao\StringUtil;
-use MummertMedia\EventManagerBundle\Form\OrganizationType;
-use MummertMedia\EventManagerBundle\Service\OrganizationRepository;
+use Mummert\EventManagerBundle\Form\OrganizationType;
+use Mummert\EventManagerBundle\Service\OrganizationRepository;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/DependencyInjection/MummertMediaEventManagerExtension.php b/src/DependencyInjection/EventManagerExtension.php
similarity index 80%
rename from src/DependencyInjection/MummertMediaEventManagerExtension.php
rename to src/DependencyInjection/EventManagerExtension.php
index ac18ccb..fd02f94 100644
--- a/src/DependencyInjection/MummertMediaEventManagerExtension.php
+++ b/src/DependencyInjection/EventManagerExtension.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\DependencyInjection;
+namespace Mummert\EventManagerBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class MummertMediaEventManagerExtension extends Extension
+class EventManagerExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
diff --git a/src/EventListener/DataContainer/SetDateAddedCallback.php b/src/EventListener/DataContainer/SetDateAddedCallback.php
index 94a1e94..59dd887 100644
--- a/src/EventListener/DataContainer/SetDateAddedCallback.php
+++ b/src/EventListener/DataContainer/SetDateAddedCallback.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\EventListener\DataContainer;
+namespace Mummert\EventManagerBundle\EventListener\DataContainer;
 
 use Contao\DataContainer;
 
diff --git a/src/EventListener/EventFullTemplateDataListener.php b/src/EventListener/EventFullTemplateDataListener.php
index bb8a391..6abe254 100644
--- a/src/EventListener/EventFullTemplateDataListener.php
+++ b/src/EventListener/EventFullTemplateDataListener.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\EventListener;
+namespace Mummert\EventManagerBundle\EventListener;
 
 use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\StringUtil;
diff --git a/src/EventListener/EventTeaserDataAttributesListener.php b/src/EventListener/EventTeaserDataAttributesListener.php
index 3a74e3c..36aa8e1 100644
--- a/src/EventListener/EventTeaserDataAttributesListener.php
+++ b/src/EventListener/EventTeaserDataAttributesListener.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\EventListener;
+namespace Mummert\EventManagerBundle\EventListener;
 
 use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\Module;
diff --git a/src/EventListener/OrganizationListingTemplateDataListener.php b/src/EventListener/OrganizationListingTemplateDataListener.php
index 5704175..c505234 100644
--- a/src/EventListener/OrganizationListingTemplateDataListener.php
+++ b/src/EventListener/OrganizationListingTemplateDataListener.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\EventListener;
+namespace Mummert\EventManagerBundle\EventListener;
 
 use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\StringUtil;
diff --git a/src/MummertMediaEventManagerBundle.php b/src/EventManagerBundle.php
similarity index 62%
rename from src/MummertMediaEventManagerBundle.php
rename to src/EventManagerBundle.php
index 4892911..00aee55 100644
--- a/src/MummertMediaEventManagerBundle.php
+++ b/src/EventManagerBundle.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle;
+namespace Mummert\EventManagerBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class MummertMediaEventManagerBundle extends Bundle
+class EventManagerBundle extends Bundle
 {
 	public function getPath(): string
 	{
diff --git a/src/Form/EventType.php b/src/Form/EventType.php
index 64b2075..7650b75 100644
--- a/src/Form/EventType.php
+++ b/src/Form/EventType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Form;
+namespace Mummert\EventManagerBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
diff --git a/src/Form/OrganizationType.php b/src/Form/OrganizationType.php
index c25cc4e..14eb712 100644
--- a/src/Form/OrganizationType.php
+++ b/src/Form/OrganizationType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Form;
+namespace Mummert\EventManagerBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
diff --git a/src/Model/LocationModel.php b/src/Model/LocationModel.php
index 7367220..178f8f5 100644
--- a/src/Model/LocationModel.php
+++ b/src/Model/LocationModel.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Model;
+namespace Mummert\EventManagerBundle\Model;
 
 use Contao\Model;
 
diff --git a/src/Model/OrganizationModel.php b/src/Model/OrganizationModel.php
index abc712a..8542384 100644
--- a/src/Model/OrganizationModel.php
+++ b/src/Model/OrganizationModel.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Model;
+namespace Mummert\EventManagerBundle\Model;
 
 use Contao\Model;
 
diff --git a/src/Service/EventRepository.php b/src/Service/EventRepository.php
index 02dcfcc..45d8f30 100644
--- a/src/Service/EventRepository.php
+++ b/src/Service/EventRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Service;
+namespace Mummert\EventManagerBundle\Service;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
diff --git a/src/Service/MapModuleDataProvider.php b/src/Service/MapModuleDataProvider.php
index 68d8ebf..e21b37b 100644
--- a/src/Service/MapModuleDataProvider.php
+++ b/src/Service/MapModuleDataProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Service;
+namespace Mummert\EventManagerBundle\Service;
 
 use Contao\CalendarEventsModel;
 use Contao\CoreBundle\Framework\ContaoFramework;
diff --git a/src/Service/OrganizationRepository.php b/src/Service/OrganizationRepository.php
index b6511ab..b6172d2 100644
--- a/src/Service/OrganizationRepository.php
+++ b/src/Service/OrganizationRepository.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MummertMedia\EventManagerBundle\Service;
+namespace Mummert\EventManagerBundle\Service;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;