diff --git a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php
index 86226d2..4cc31b2 100644
--- a/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php
+++ b/src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php
@@ -30,12 +30,12 @@ class RegisterDefinitionMapperPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.mapper')) {
+        if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.mapper')) {
             return;
         }
 
-        $definition     = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.mapper');
-        $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.mapper');
+        $definition     = $container->getDefinition('netzmacht.contao_leaflet.definition.mapper');
+        $taggedServices = $container->findTaggedServiceIds('netzmacht.contao_leaflet.mapper');
 
         foreach ($taggedServices as $serviceId => $tags) {
             foreach ($tags as $attributes) {
diff --git a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php
index af92cbb..809c787 100644
--- a/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php
+++ b/src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php
@@ -30,12 +30,12 @@ class RegisterEncodersPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher')) {
+        if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.builder.event_dispatcher')) {
             return;
         }
 
-        $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher');
-        $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet_maps.encoder');
+        $definition = $container->getDefinition('netzmacht.contao_leaflet.definition.builder.event_dispatcher');
+        $serviceIds = $container->findTaggedServiceIds('netzmacht.contao_leaflet.encoder');
 
         foreach (array_keys($serviceIds) as $serviceId) {
             $definition->addMethodCall('addSubscriber', [new Reference($serviceId)]);
diff --git a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php
index b05416b..d1778c5 100644
--- a/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php
+++ b/src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php
@@ -30,16 +30,16 @@ class RegisterLibrariesPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('netzmacht.contao_leaflet_maps.definition.builder')) {
+        if (!$container->hasDefinition('netzmacht.contao_leaflet.definition.builder')) {
             return;
         }
 
-        if (!$container->hasParameter('netzmacht.contao_leaflet_maps.libraries')) {
+        if (!$container->hasParameter('netzmacht.contao_leaflet.libraries')) {
             return;
         }
 
-        $definition = $container->getDefinition('netzmacht.contao_leaflet_maps.definition.builder');
-        $libraries  = $container->getParameter('netzmacht.contao_leaflet_maps.libraries');
+        $definition = $container->getDefinition('netzmacht.contao_leaflet.definition.builder');
+        $libraries  = $container->getParameter('netzmacht.contao_leaflet.libraries');
 
         foreach ($libraries as $name => $assets) {
             if (!empty($assets['css'])) {
diff --git a/src/Bundle/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php
index d3ebd7a..601bdea 100644
--- a/src/Bundle/NetzmachtContaoLeafletBundle.php
+++ b/src/Bundle/NetzmachtContaoLeafletBundle.php
@@ -38,8 +38,8 @@ class NetzmachtContaoLeafletBundle extends Bundle
         $container->addCompilerPass(new RegisterLibrariesPass());
         $container->addCompilerPass(
             new AddTaggedServicesAsArgumentPass(
-                'netzmacht.contao_leaflet_maps.layer_label_renderer',
-                'netzmacht.contao_leaflet_maps.layer_label_renderer'
+                'netzmacht.contao_leaflet.layer_label_renderer',
+                'netzmacht.contao_leaflet.layer_label_renderer'
             )
         );
     }
diff --git a/src/Bundle/Resources/config/amenities.yml b/src/Bundle/Resources/config/amenities.yml
index fa8ff6b..1c063eb 100644
--- a/src/Bundle/Resources/config/amenities.yml
+++ b/src/Bundle/Resources/config/amenities.yml
@@ -1,5 +1,5 @@
 parameters:
-  netzmacht.contao_leaflet_maps.amenities:
+  netzmacht.contao_leaflet.amenities:
     - 'administration'
     - 'advertising'
     - 'alm'
diff --git a/src/Bundle/Resources/config/config.yml b/src/Bundle/Resources/config/config.yml
index 1624280..bbc7d26 100644
--- a/src/Bundle/Resources/config/config.yml
+++ b/src/Bundle/Resources/config/config.yml
@@ -2,7 +2,7 @@ parameters:
   # leaflet controls.
   #
   # Supported leaflet control types. Register your type for the database driven definition here.
-  netzmacht.contao_leaflet_maps.controls:
+  netzmacht.contao_leaflet.controls:
     - 'zoom'
     - 'layers'
     - 'scale'
@@ -13,7 +13,7 @@ parameters:
   # Leaflet icons.
   #
   # Supported leaflet icon types. Register you type for the database driven definition here.
-  netzmacht.contao_leaflet_maps.icons:
+  netzmacht.contao_leaflet.icons:
     - 'image'
     - 'div'
     - 'extra'
@@ -23,13 +23,13 @@ parameters:
   #
   # The goal is to provide different style strategies. For instance a random style chooser, one which uses a color
   # range and so one.
-  netzmacht.contao_leaflet_maps.styles:
+  netzmacht.contao_leaflet.styles:
     - 'fixed'
 
   # Leaflet vectors.
   #
   # Supported leaflet vector types. Register you type for the database driven definition here.
-  netzmacht.contao_leaflet_maps.vectors:
+  netzmacht.contao_leaflet.vectors:
     - 'polyline'
     - 'polygon'
     - 'multiPolyline'
@@ -48,7 +48,7 @@ parameters:
   #  - array:  Use deserialize before adding the value
   #  - file:   Thread value a uuid and find the path.
   #  - files:  Thread values as a list of file uuids and get an array of paths.
-  netzmacht.contao_leaflet_maps.feature_model_properties:
+  netzmacht.contao_leaflet.feature_model_properties:
     tl_leaflet_marker:
       - 'id'
       - 'title'
diff --git a/src/Bundle/Resources/config/encoders.yml b/src/Bundle/Resources/config/encoders.yml
index 1d9c81f..b4ac73e 100644
--- a/src/Bundle/Resources/config/encoders.yml
+++ b/src/Bundle/Resources/config/encoders.yml
@@ -6,42 +6,42 @@ services:
   _defaults:
     public: false
 
-  netzmacht.contao_leaflet_maps.encoder.map:
+  netzmacht.contao_leaflet.encoder.map:
     class: Netzmacht\LeafletPHP\Encoder\MapEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
 
-  netzmacht.contao_leaflet_maps.encoder.control:
+  netzmacht.contao_leaflet.encoder.control:
     class: Netzmacht\LeafletPHP\Encoder\ControlEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
 
-  netzmacht.contao_leaflet_maps.encoder.group:
+  netzmacht.contao_leaflet.encoder.group:
     class: Netzmacht\LeafletPHP\Encoder\GroupEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
       
-  netzmacht.contao_leaflet_maps.encoder.raster:
+  netzmacht.contao_leaflet.encoder.raster:
     class: Netzmacht\LeafletPHP\Encoder\RasterEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
       
-  netzmacht.contao_leaflet_maps.encoder.vector:
+  netzmacht.contao_leaflet.encoder.vector:
     class: Netzmacht\LeafletPHP\Encoder\VectorEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
       
-  netzmacht.contao_leaflet_maps.encoder.ui:
+  netzmacht.contao_leaflet.encoder.ui:
     class: Netzmacht\LeafletPHP\Encoder\UIEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
       
-  netzmacht.contao_leaflet_maps.encoder.type:
+  netzmacht.contao_leaflet.encoder.type:
     class: Netzmacht\LeafletPHP\Encoder\TypeEncoder
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
 
-  netzmacht.contao_leaflet_maps.encoder.subscriber:
+  netzmacht.contao_leaflet.encoder.subscriber:
     class: Netzmacht\Contao\Leaflet\Subscriber\EncoderSubscriber
     tags:
-      - { name: netzmacht.contao_leaflet_maps.encoder }
+      - { name: netzmacht.contao_leaflet.encoder }
diff --git a/src/Bundle/Resources/config/filters.yml b/src/Bundle/Resources/config/filters.yml
index 3a8bf82..7f3cb2e 100644
--- a/src/Bundle/Resources/config/filters.yml
+++ b/src/Bundle/Resources/config/filters.yml
@@ -1,11 +1,11 @@
 services:
   # Filters can be passed to a data request to get only specific data from a layer.
-  netzmacht.contao_leaflet_maps.filter.bbox:
+  netzmacht.contao_leaflet.filter.bbox:
     class: Netzmacht\Contao\Leaflet\Filter\BboxFilter
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'bbox' }
+      - { name: 'netzmacht.contao_leaflet.filter', alias: 'bbox' }
 
-  netzmacht.contao_leaflet_maps.filter.distance:
+  netzmacht.contao_leaflet.filter.distance:
     class: Netzmacht\Contao\Leaflet\Filter\DistanceFilter
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.filter', alias: 'distance' }
+      - { name: 'netzmacht.contao_leaflet.filter', alias: 'distance' }
diff --git a/src/Bundle/Resources/config/layers.yml b/src/Bundle/Resources/config/layers.yml
index 6026489..4716389 100644
--- a/src/Bundle/Resources/config/layers.yml
+++ b/src/Bundle/Resources/config/layers.yml
@@ -2,7 +2,7 @@
 #
 # The type is used for the database driven definitions.
 parameters:
-  netzmacht.contao_leaflet_maps.layers:
+  netzmacht.contao_leaflet.layers:
     provider:
       children: false
       icon: 'bundles/netzmachtcontaoleaflet/img/provider.png'
@@ -49,32 +49,32 @@ services:
   _defaults:
     public: false
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer:
+  netzmacht.contao_leaflet.layer_label_renderer:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ChainRenderer
     arguments:
       - []
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer.markers:
+  netzmacht.contao_leaflet.layer_label_renderer.markers:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\MarkersLabelRenderer
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' }
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer.overpass:
+  netzmacht.contao_leaflet.layer_label_renderer.overpass:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\OverpassLabelRenderer
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' }
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer.provider:
+  netzmacht.contao_leaflet.layer_label_renderer.provider:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ProviderLabelRenderer
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' }
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer.reference:
+  netzmacht.contao_leaflet.layer_label_renderer.reference:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\ReferenceLabelRenderer
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' }
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
 
-  netzmacht.contao_leaflet_maps.layer_label_renderer.vectors:
+  netzmacht.contao_leaflet.layer_label_renderer.vectors:
     class: Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\VectorsLabelRenderer
     tags:
-      - { name: 'netzmacht.contao_leaflet_maps.layer_label_renderer' }
+      - { name: 'netzmacht.contao_leaflet.layer_label_renderer' }
diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml
index d90ef29..944f15d 100644
--- a/src/Bundle/Resources/config/listeners.yml
+++ b/src/Bundle/Resources/config/listeners.yml
@@ -1,90 +1,90 @@
 services:
-  netzmacht.contao_leaflet_maps.listeners.dca.leaflet:
+  netzmacht.contao_leaflet.listeners.dca.leaflet:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\LeafletDcaListener
     arguments:
       - '@filesystem'
-      - '%netzmacht.contao_leaflet_maps.cache_dir%'
+      - '%netzmacht.contao_leaflet.cache_dir%'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.validator:
+  netzmacht.contao_leaflet.listeners.dca.validator:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\Validator
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@translator'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration:
+  netzmacht.contao_leaflet.listeners.dca.frontend_integration:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\FrontendIntegrationListener
     arguments:
       - '@translator'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.map:
+  netzmacht.contao_leaflet.listeners.dca.map:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\MapDcaListener
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.control:
+  netzmacht.contao_leaflet.listeners.dca.control:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\ControlDcaListener
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
-      - '%netzmacht.contao_leaflet_maps.controls%'
+      - '%netzmacht.contao_leaflet.controls%'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.layer:
+  netzmacht.contao_leaflet.listeners.dca.layer:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\LayerDcaListener
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
       - '@translator'
-      - '@netzmacht.contao_leaflet_maps.layer_label_renderer'
-      - '%netzmacht.contao_leaflet_maps.layers%'
-      - '%netzmacht.contao_leaflet_maps.providers%'
-      - '%netzmacht.contao_leaflet_maps.amenities%'
+      - '@netzmacht.contao_leaflet.layer_label_renderer'
+      - '%netzmacht.contao_leaflet.layers%'
+      - '%netzmacht.contao_leaflet.providers%'
+      - '%netzmacht.contao_leaflet.amenities%'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.marker:
+  netzmacht.contao_leaflet.listeners.dca.marker:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\MarkerDcaListener
     arguments:
       - '@database_connection'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.vector:
+  netzmacht.contao_leaflet.listeners.dca.vector:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\VectorDcaListener
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
-      - '%netzmacht.contao_leaflet_maps.vectors%'
+      - '%netzmacht.contao_leaflet.vectors%'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.icon:
+  netzmacht.contao_leaflet.listeners.dca.icon:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
     arguments:
-      - '%netzmacht.contao_leaflet_maps.icons%'
+      - '%netzmacht.contao_leaflet.icons%'
 
-  netzmacht.contao_leaflet_maps.listeners.dca.style:
+  netzmacht.contao_leaflet.listeners.dca.style:
     class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
     arguments:
-      - '%netzmacht.contao_leaflet_maps.styles%'
+      - '%netzmacht.contao_leaflet.styles%'
 
-  netzmacht.contao_leaflet_maps.listeners.geo_json_subscriber:
+  netzmacht.contao_leaflet.listeners.geo_json_subscriber:
     class: Netzmacht\Contao\Leaflet\Subscriber\GeoJsonSubscriber
     arguments:
-      - '%netzmacht.contao_leaflet_maps.feature_model_properties%'
+      - '%netzmacht.contao_leaflet.feature_model_properties%'
     tags:
       - { name: 'kernel.event_subscriber' }
 
-  netzmacht.contao_leaflet_maps.listeners.hash_subscriber:
+  netzmacht.contao_leaflet.listeners.hash_subscriber:
     class: Netzmacht\Contao\Leaflet\Subscriber\HashSubscriber
     tags:
       - { name: 'kernel.event_subscriber' }
 
-  netzmacht.contao_leaflet_maps.listeners.load_assets:
+  netzmacht.contao_leaflet.listeners.load_assets:
     class: Netzmacht\Contao\Leaflet\Listener\LoadAssetsListener
     arguments:
-      - '@netzmacht.contao_leaflet_maps.map.assets'
-      - '@netzmacht.contao_leaflet_maps.definition.mapper'
-      - '@netzmacht.contao_leaflet_maps.libraries'
+      - '@netzmacht.contao_leaflet.map.assets'
+      - '@netzmacht.contao_leaflet.definition.mapper'
+      - '@netzmacht.contao_leaflet.libraries'
     tags:
       - { name: 'kernel.event_listener', event: 'netzmacht.contao_leaflet.get_javascript', method: 'onGetJavascriptEvent' }
 
-  netzmacht.contao_leaflet_maps.listeners.register_libraries:
+  netzmacht.contao_leaflet.listeners.register_libraries:
     class: Netzmacht\Contao\Leaflet\Listener\RegisterLibrariesListener
     arguments:
-     - '@netzmacht.contao_leaflet_maps.libraries'
-     - '@netzmacht.contao_leaflet_maps.definition.builder'
+     - '@netzmacht.contao_leaflet.libraries'
+     - '@netzmacht.contao_leaflet.definition.builder'
 
diff --git a/src/Bundle/Resources/config/mappers.yml b/src/Bundle/Resources/config/mappers.yml
index 5265dde..9a50e51 100644
--- a/src/Bundle/Resources/config/mappers.yml
+++ b/src/Bundle/Resources/config/mappers.yml
@@ -7,171 +7,171 @@ services:
 
 
   # Map mapper
-  netzmacht.contao_leaflet_maps.mapper.map:
+  netzmacht.contao_leaflet.mapper.map:
     class: Netzmacht\Contao\Leaflet\Mapper\MapMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
 
   # Layer mappers
-  netzmacht.contao_leaflet_maps.mapper.tile_layer:
+  netzmacht.contao_leaflet.mapper.tile_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\TileLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.provider_layer:
+  netzmacht.contao_leaflet.mapper.provider_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\ProviderLayerMapper
     arguments:
-      - '%netzmacht.contao_leaflet_maps.providers%'
+      - '%netzmacht.contao_leaflet.providers%'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.markers_layer:
+  netzmacht.contao_leaflet.mapper.markers_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkersLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.group_layer:
+  netzmacht.contao_leaflet.mapper.group_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\GroupLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.vectors_layer:
+  netzmacht.contao_leaflet.mapper.vectors_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\VectorsLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.reference_layer:
+  netzmacht.contao_leaflet.mapper.reference_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\ReferenceLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.overpass_layer:
+  netzmacht.contao_leaflet.mapper.overpass_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\OverpassLayerMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.marker_cluster_layer:
+  netzmacht.contao_leaflet.mapper.marker_cluster_layer:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\MarkerClusterLayerMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.map.assets'
+      - '@netzmacht.contao_leaflet.map.assets'
     tags:
       - { name: netzmacht.contao_leflet_maps.mapper }
 
 
   # Control mappers
-  netzmacht.contao_leaflet_maps.mapper.zoom_control:
+  netzmacht.contao_leaflet.mapper.zoom_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\ZoomControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.scale_control:
+  netzmacht.contao_leaflet.mapper.scale_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\ScaleControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.layers_control:
+  netzmacht.contao_leaflet.mapper.layers_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\LayersControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.attribution_control:
+  netzmacht.contao_leaflet.mapper.attribution_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\AttributionControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.loading_control:
+  netzmacht.contao_leaflet.mapper.loading_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\LoadingControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.fullscreen_control:
+  netzmacht.contao_leaflet.mapper.fullscreen_control:
     class: Netzmacht\Contao\Leaflet\Mapper\Control\FullscreenControlMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
 
   # Vector mappers
-  netzmacht.contao_leaflet_maps.mapper.polyline:
+  netzmacht.contao_leaflet.mapper.polyline:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolylineMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.multi_polyline:
+  netzmacht.contao_leaflet.mapper.multi_polyline:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolylineMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.polygon:
+  netzmacht.contao_leaflet.mapper.polygon:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\PolygonMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.multi_polygon:
+  netzmacht.contao_leaflet.mapper.multi_polygon:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\MultiPolygonMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.circle:
+  netzmacht.contao_leaflet.mapper.circle:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.circle_mapper:
+  netzmacht.contao_leaflet.mapper.circle_mapper:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\CircleMarkerMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.rectangle_mapper:
+  netzmacht.contao_leaflet.mapper.rectangle_mapper:
     class: Netzmacht\Contao\Leaflet\Mapper\Vector\RectangleMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
 
   # Miscellaneous mappers
-  netzmacht.contao_leaflet_maps.mapper.popup:
+  netzmacht.contao_leaflet.mapper.popup:
     class: Netzmacht\Contao\Leaflet\Mapper\UI\PopupMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.image_icon:
+  netzmacht.contao_leaflet.mapper.image_icon:
     class: Netzmacht\Contao\Leaflet\Mapper\Type\ImageIconMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.div_icon:
+  netzmacht.contao_leaflet.mapper.div_icon:
     class: Netzmacht\Contao\Leaflet\Mapper\Type\DivIconMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.extra_markers:
+  netzmacht.contao_leaflet.mapper.extra_markers:
     class: Netzmacht\Contao\Leaflet\Mapper\Type\ExtraMarkersIconMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.fixed_style:
+  netzmacht.contao_leaflet.mapper.fixed_style:
     class: Netzmacht\Contao\Leaflet\Mapper\Style\FixedStyleMapper
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
-  netzmacht.contao_leaflet_maps.mapper.marker:
+  netzmacht.contao_leaflet.mapper.marker:
     class: Netzmacht\Contao\Leaflet\Mapper\UI\MarkerMapper
     arguments:
-      - '@netzmacht.contao_leaflet_maps.frontend.value_filter'
+      - '@netzmacht.contao_leaflet.frontend.value_filter'
     tags:
-      - { name: netzmacht.contao_leaflet_maps.mapper }
+      - { name: netzmacht.contao_leaflet.mapper }
 
diff --git a/src/Bundle/Resources/config/providers.yml b/src/Bundle/Resources/config/providers.yml
index 6b61706..880ddde 100644
--- a/src/Bundle/Resources/config/providers.yml
+++ b/src/Bundle/Resources/config/providers.yml
@@ -1,5 +1,5 @@
 parameters:
-  netzmacht.contao_leaflet_maps.providers:
+  netzmacht.contao_leaflet.providers:
     OpenStreetMap:
       variants: ['Mapnik', 'BlackAndWhite', 'DE', 'France', 'HOT', 'BZH']
 
diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml
index d69c5ac..f7b8634 100644
--- a/src/Bundle/Resources/config/services.yml
+++ b/src/Bundle/Resources/config/services.yml
@@ -1,83 +1,83 @@
 parameters:
-  netzmacht.contao_leaflet_maps.cache_dir: '%kernel.cache_dir%/leaflet'
+  netzmacht.contao_leaflet.cache_dir: '%kernel.cache_dir%/leaflet'
 
   # JSON_UNESCAPED_SLASHES ^ Netzmacht\JavascriptBuilder\Flags::BUILD_STACK
-  netzmacht.contao_leaflet_maps.encoding_flags: 16448
+  netzmacht.contao_leaflet.encoding_flags: 16448
 
 services:
-  netzmacht.contao_leaflet_maps.map.provider:
+  netzmacht.contao_leaflet.map.provider:
     class: Netzmacht\Contao\Leaflet\MapProvider
     arguments:
-      - '@netzmacht.contao_leaflet_maps.definition.mapper'
-      - '@netzmacht.contao_leaflet_maps.definition.builder'
+      - '@netzmacht.contao_leaflet.definition.mapper'
+      - '@netzmacht.contao_leaflet.definition.builder'
       - '@event_dispatcher'
       - '@netzmacht.contao_toolkit.contao.input'
-      - '@netzmacht.contao_leaflet_maps.map.assets'
-      - '@netzmacht.contao_leaflet_maps.cache'
+      - '@netzmacht.contao_leaflet.map.assets'
+      - '@netzmacht.contao_leaflet.cache'
       - [] # TODO: Rework filter handling.
       - '%kernel.debug%'
 
-  netzmacht.contao_leaflet_maps.libraries:
+  netzmacht.contao_leaflet.libraries:
     class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration
     arguments:
       - '@contao.framework'
 
-  netzmacht.contao_leaflet_maps.cache:
-    alias: 'netzmacht.contao_leaflet_maps.cache.default'
+  netzmacht.contao_leaflet.cache:
+    alias: 'netzmacht.contao_leaflet.cache.default'
 
-  netzmacht.contao_leaflet_maps.cache.default:
+  netzmacht.contao_leaflet.cache.default:
     class: Doctrine\Common\Cache\FilesystemCache
     arguments:
-      - '%netzmacht.contao_leaflet_maps.cache_dir%'
+      - '%netzmacht.contao_leaflet.cache_dir%'
 
-  netzmacht.contao_leaflet_maps.cache.debug:
+  netzmacht.contao_leaflet.cache.debug:
     class: Doctrine\Common\Cache\ArrayCache
 
-  netzmacht.contao_leaflet_maps.frontend.value_filter:
+  netzmacht.contao_leaflet.frontend.value_filter:
     class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter
 
-  netzmacht.contao_leaflet_maps.map.assets:
+  netzmacht.contao_leaflet.map.assets:
     class: Netzmacht\Contao\Leaflet\ContaoAssets
     arguments:
       - '@netzmacht.contao_toolkit.assets_manager'
 
-  netzmacht.contao_leaflet_maps.definition.builder:
+  netzmacht.contao_leaflet.definition.builder:
     class: Netzmacht\LeafletPHP\Leaflet
     arguments:
-      - '@netzmacht.contao_leaflet_maps.definition.builder.javascript_builder'
-      - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher'
+      - '@netzmacht.contao_leaflet.definition.builder.javascript_builder'
+      - '@netzmacht.contao_leaflet.definition.builder.event_dispatcher'
       - []
-      - '%netzmacht.contao_leaflet_maps.encoding_flags%'
+      - '%netzmacht.contao_leaflet.encoding_flags%'
 
-  netzmacht.contao_leaflet_maps.definition.builder.javascript_builder:
+  netzmacht.contao_leaflet.definition.builder.javascript_builder:
     class: Netzmacht\JavascriptBuilder\Builder
     arguments:
-      - '@netzmacht.contao_leaflet_maps.definition.encoder_factory'
+      - '@netzmacht.contao_leaflet.definition.encoder_factory'
 
-  netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher:
+  netzmacht.contao_leaflet.definition.builder.event_dispatcher:
     class: Symfony\Component\EventDispatcher\EventDispatcher
 
-  netzmacht.contao_leaflet_maps.definition.mapper:
+  netzmacht.contao_leaflet.definition.mapper:
     class: Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper
     arguments:
       - '@event_dispatcher'
 
-  netzmacht.contao_leaflet_maps.definition.encoder_factory:
+  netzmacht.contao_leaflet.definition.encoder_factory:
     class: Netzmacht\Contao\Leaflet\Encoder\EncoderFactory
     arguments:
-      - '@netzmacht.contao_leaflet_maps.definition.builder.event_dispatcher'
+      - '@netzmacht.contao_leaflet.definition.builder.event_dispatcher'
 
-  netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default:
+  netzmacht.contao_leaflet.definition.alias_generator.factory_default:
     class: Netzmacht\Contao\Leaflet\Alias\DefaultAliasGeneratorFactory
     arguments:
       - '@database_connection'
 
-  netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent:
+  netzmacht.contao_leaflet.definition.alias_generator.factory_parent:
     class: Netzmacht\Contao\Leaflet\Alias\ParentAliasGeneratorFactory
     arguments:
       - '@database_connection'
 
-  netzmacht.contao_leaflet_maps.frontend.element_factory:
+  netzmacht.contao_leaflet.frontend.element_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory
     arguments:
       - '@service_container'
@@ -85,7 +85,7 @@ services:
       - { name: 'netzmacht.contao_toolkit.component.content_element_factory' }
       - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'include' }
 
-  netzmacht.contao_leaflet_maps.frontend.module_factory:
+  netzmacht.contao_leaflet.frontend.module_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory
     arguments:
       - '@service_container'
@@ -93,10 +93,10 @@ services:
       - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' }
       - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: include }
 
-  netzmacht.contao_leaflet_maps.frontend.insert_tag:
+  netzmacht.contao_leaflet.frontend.insert_tag:
     class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser
     arguments:
-      - '@netzmacht.contao_leaflet_maps.map.provider'
+      - '@netzmacht.contao_leaflet.map.provider'
       - '%kernel.debug%'
     tags:
       - { name: 'contao.hook', hook: 'replaceInsertTags', method: 'replace' }
diff --git a/src/Bundle/Resources/contao/config/config.php b/src/Bundle/Resources/contao/config/config.php
index d373225..5c21f12 100644
--- a/src/Bundle/Resources/contao/config/config.php
+++ b/src/Bundle/Resources/contao/config/config.php
@@ -72,6 +72,6 @@ $GLOBALS['TL_MODELS']['tl_leaflet_vector']  = \Netzmacht\Contao\Leaflet\Model\Ve
  */
 
 $GLOBALS['TL_HOOKS']['initializeSystem'][] = [
-    'netzmacht.contao_leaflet_maps.listeners.register_libraries',
+    'netzmacht.contao_leaflet.listeners.register_libraries',
     'onInitializeSystem'
 ];
diff --git a/src/Bundle/Resources/contao/dca/tl_content.php b/src/Bundle/Resources/contao/dca/tl_content.php
index 77b4fa6..c0127d2 100644
--- a/src/Bundle/Resources/contao/dca/tl_content.php
+++ b/src/Bundle/Resources/contao/dca/tl_content.php
@@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['leaflet_map'] = [
     'label'            => &$GLOBALS['TL_LANG']['tl_content']['leaflet_map'],
     'inputType'        => 'select',
     'exclude'          => true,
-    'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'],
+    'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getMaps'],
     'wizard'           => [
-        ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'],
+        ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getEditMapLink'],
     ],
     'eval'             => [
         'tl_class' => 'w50 wizard',
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
index c0ef6fc..0169793 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
@@ -22,10 +22,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -38,7 +38,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             'flag'                  => 1,
             'sorting'               => 2,
             'panelLayout'           => 'filter,sort;search,limit',
-            'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'generateRow'],
+            'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'generateRow'],
         ],
         'label'             => [
             'fields' => ['title'],
@@ -157,7 +157,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             'search'        => true,
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => [
                 'mandatory'   => false,
@@ -167,7 +167,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             ],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_parent',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_parent',
                     'fields'  => ['title'],
                 ],
             ],
@@ -187,7 +187,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                 'chosen'             => true,
                 'helpwizard'         => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getControlTypes'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getControlTypes'],
             'reference'        => &$GLOBALS['TL_LANG']['leaflet_control'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
@@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
         'zoomInText'         => [
@@ -262,10 +262,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             'exclude'       => true,
             'inputType'     => 'multiColumnWizard',
             'load_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'loadLayerRelations'],
+                ['netzmacht.contao_leaflet.listeners.dca.control', 'loadLayerRelations'],
             ],
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'saveLayerRelations'],
+                ['netzmacht.contao_leaflet.listeners.dca.control', 'saveLayerRelations'],
             ],
             'eval'          => [
                 'tl_class'     => 'clr',
@@ -274,7 +274,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                         'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_control']['layer'],
                         'exclude'          => true,
                         'inputType'        => 'select',
-                        'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getLayers'],
+                        'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getLayers'],
                         'eval'             => [
                             'style'              => 'width: 300px',
                             'chosen'             => true,
@@ -352,7 +352,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_control']['zoomControl'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.control', 'getZoomControls'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.control', 'getZoomControls'],
             'reference'        => &$GLOBALS['TL_LANG']['tl_leaflet_control'],
             'eval'             => [
                 'mandatory'          => false,
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
index aa080fc..d3c2543 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
@@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             ],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -177,12 +177,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             'inputType'     => 'text',
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -199,7 +199,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                 'submitOnChange'     => true,
                 'chosen'             => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.icon', 'getIconOptions'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.icon', 'getIconOptions'],
             'reference'        => &$GLOBALS['TL_LANG']['leaflet_icon'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
@@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
         'iconImage'         => [
@@ -270,7 +270,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
@@ -284,7 +284,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
@@ -298,7 +298,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
index 8de855b..03fe1d8 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
@@ -16,7 +16,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
         'enableVersioning'  => true,
         'ctable'            => ['tl_leaflet_vector', 'tl_leaflet_marker'],
         'ondelete_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'deleteRelations'],
+            ['netzmacht.contao_leaflet.listeners.dca.layer', 'deleteRelations'],
         ],
         'sql'               => [
             'keys' => [
@@ -26,10 +26,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
     'list'   => [
@@ -39,12 +39,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'flag'                  => 1,
             'icon'                  => 'bundles/netzmachtcontaoleaflet/img/layers.png',
             'panelLayout'           => 'filter;search,limit',
-            'paste_button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getPasteButtons'],
+            'paste_button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getPasteButtons'],
         ],
         'label'             => [
             'fields'         => ['title'],
             'format'         => '%s',
-            'label_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateRow'],
+            'label_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateRow'],
         ],
         'global_operations' => [
             'styles' => [
@@ -77,13 +77,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['markers'],
                 'href'            => 'table=tl_leaflet_marker',
                 'icon'            => 'edit.gif',
-                'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateMarkersButton'],
+                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateMarkersButton'],
             ],
             'vectors' => [
                 'label'           => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['vectors'],
                 'href'            => 'table=tl_leaflet_vector',
                 'icon'            => 'edit.gif',
-                'button_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'generateVectorsButton'],
+                'button_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'generateVectorsButton'],
             ],
             'edit'    => [
                 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'],
@@ -262,12 +262,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'search'        => true,
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -286,7 +286,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'chosen'             => true,
                 'helpwizard'         => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayerOptions'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getLayerOptions'],
             'reference'        => &$GLOBALS['TL_LANG']['leaflet_layer'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
@@ -298,7 +298,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
         'tile_provider'                  => [
@@ -312,7 +312,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'submitOnChange'     => true,
                 'chosen'             => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getProviderOptions'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getProviderOptions'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
         'tile_provider_variant'          => [
@@ -325,7 +325,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'submitOnChange' => true,
                 'chosen'         => false,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getVariants'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getVariants'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
         'tile_provider_key'              => [
@@ -369,7 +369,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['reference'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getLayers'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getLayers'],
             'eval'             => [
                 'mandatory'          => true,
                 'tl_class'           => 'w50',
@@ -456,7 +456,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['disableClusteringAtZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'default'          => null,
             'eval'             => [
                 'maxlength'          => 4,
@@ -529,7 +529,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['boundsMode'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getBoundsModes'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getBoundsModes'],
             'eval'             => ['tl_class' => 'w50', 'includeBlankOption' => true],
             'sql'              => "varchar(6) NOT NULL default ''",
         ],
@@ -545,7 +545,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['minZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
@@ -559,7 +559,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
@@ -573,7 +573,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['maxNativeZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
@@ -807,14 +807,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcons'],
             'exclude'          => true,
             'inputType'        => 'multiColumnWizard',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getIcons'],
             'eval'             => [
                 'columnFields' => [
                     'amenity' => [
                         'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenity'],
                         'exclude'          => true,
                         'inputType'        => 'select',
-                        'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getAmenities'],
+                        'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getAmenities'],
                         'eval'             => [
                             'mandatory' => true,
                             'tl_class'  => 'w50',
@@ -826,7 +826,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                         'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['amenityIcon'],
                         'exclude'          => true,
                         'inputType'        => 'select',
-                        'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.layer', 'getIcons'],
+                        'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.layer', 'getIcons'],
                         'eval'             => [
                             'mandatory' => true,
                             'tl_class'  => 'w50',
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
index 9a24940..7ef86c3 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
@@ -22,10 +22,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -154,12 +154,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'search'        => true,
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -170,10 +170,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'wizard'        => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
@@ -187,10 +187,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'exclude'       => true,
             'inputType'     => 'multiColumnWizard',
             'load_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'loadLayerRelations'],
+                ['netzmacht.contao_leaflet.listeners.dca.map', 'loadLayerRelations'],
             ],
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'saveLayerRelations'],
+                ['netzmacht.contao_leaflet.listeners.dca.map', 'saveLayerRelations'],
             ],
             'eval'          => [
                 'multiple'       => true,
@@ -200,7 +200,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
                         'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_map']['reference'],
                         'exclude'          => true,
                         'inputType'        => 'select',
-                        'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.map', 'getLayers'],
+                        'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.map', 'getLayers'],
                         'eval'             => [
                             'mandatory'          => false,
                             'tl_class'           => 'w50',
@@ -219,7 +219,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'default'          => null,
             'eval'             => [
                 'maxlength'          => 4,
@@ -242,7 +242,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
@@ -256,7 +256,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
@@ -503,7 +503,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getZoomLevels'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getZoomLevels'],
             'eval'             => [
                 'maxlength'          => 4,
                 'rgxp'               => 'digit',
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
index a5d9018..ef8abd5 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
@@ -23,10 +23,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'initialize'],
+            ['netzmacht.contao_leaflet.listeners.dca.marker', 'initialize'],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -37,7 +37,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'flag'                  => 1,
             'panelLayout'           => 'sort,filter;search,limit',
             'headerFields'          => ['title', 'type'],
-            'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'generateRow'],
+            'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'generateRow'],
         ],
         'label'             => [
             'fields' => ['title'],
@@ -158,12 +158,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'search'        => true,
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -174,14 +174,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'saveCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.marker', 'saveCoordinates'],
             ],
             'load_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'loadCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.marker', 'loadCoordinates'],
             ],
             'wizard'        => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'],
             ],
             'eval'          => [
                 'maxlength'      => 255,
@@ -221,7 +221,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
         'tooltip'         => [
@@ -250,7 +250,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['popup'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getPopups'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'getPopups'],
             'eval'             => [
                 'mandatory'          => false,
                 'tl_class'           => 'w50',
@@ -278,7 +278,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.marker', 'getIcons'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.marker', 'getIcons'],
             'eval'             => [
                 'mandatory' => true,
                 'tl_class'  => 'w50',
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
index 173db63..e531b79 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
@@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
             ],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -149,12 +149,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
             'inputType'     => 'text',
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -213,7 +213,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
@@ -269,7 +269,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
     ],
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
index 01a28f5..67d0d46 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
@@ -21,7 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
             ],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -143,12 +143,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
             'inputType'     => 'text',
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -165,7 +165,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                 'submitOnChange'     => true,
                 'chosen'             => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.style', 'getStyleOptions'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.style', 'getStyleOptions'],
             'reference'        => &$GLOBALS['TL_LANG']['leaflet_style'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
@@ -277,7 +277,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
     ],
diff --git a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
index a5866a2..83bc535 100644
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
@@ -23,10 +23,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             ],
         ],
         'onload_callback'   => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'loadLanguageFile'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'loadLanguageFile'],
         ],
         'onsubmit_callback' => [
-            ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+            ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
     ],
 
@@ -37,7 +37,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'flag'                  => 1,
             'panelLayout'           => 'sort,filter;search,limit',
             'headerFields'          => ['title', 'type'],
-            'child_record_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'generateRow'],
+            'child_record_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'generateRow'],
         ],
         'label'             => [
             'fields' => ['title'],
@@ -183,12 +183,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'search'        => true,
             'save_callback' => [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateAlias'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
             'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
             'toolkit'       => [
                 'alias_generator' => [
-                    'factory' => 'netzmacht.contao_leaflet_maps.definition.alias_generator.factory_default',
+                    'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
                     'fields'  => ['title'],
                 ],
             ],
@@ -210,7 +210,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                 'chosen'             => true,
                 'helpwizard'         => true,
             ],
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getVectorOptions'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'getVectorOptions'],
             'reference'        => &$GLOBALS['TL_LANG']['leaflet_vector'],
             'sql'              => "varchar(32) NOT NULL default ''",
         ],
@@ -225,7 +225,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'eval'          => ['tl_class' => 'w50'],
             'sql'           => "char(1) NOT NULL default ''",
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'clearCache'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
             ],
         ],
         'addPopup'        => [
@@ -261,7 +261,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'label'            => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['style'],
             'exclude'          => true,
             'inputType'        => 'select',
-            'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.vector', 'getStyles'],
+            'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.vector', 'getStyles'],
             'eval'             => [
                 'mandatory'          => false,
                 'tl_class'           => 'w50',
@@ -290,10 +290,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'exclude'       => true,
             'inputType'     => 'text',
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateCoordinates'],
             ],
             'wizard'        => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.leaflet', 'getGeocoder'],
+                ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'getGeocoder'],
             ],
             'eval'          => [
                 'maxlength'   => 255,
@@ -317,7 +317,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
             'search'        => false,
             'eval'          => ['mandatory' => true, 'alwaysSave' => true],
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinates'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateMultipleCoordinates'],
             ],
             'sql'           => 'longblob NULL',
         ],
@@ -339,7 +339,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                 ],
             ],
             'save_callback' => [
-                ['netzmacht.contao_leaflet_maps.listeners.dca.validator', 'validateMultipleCoordinateSets'],
+                ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateMultipleCoordinateSets'],
             ],
             'sql'           => 'longblob NULL',
         ],
diff --git a/src/Bundle/Resources/contao/dca/tl_module.php b/src/Bundle/Resources/contao/dca/tl_module.php
index e99cfbb..d9d1375 100644
--- a/src/Bundle/Resources/contao/dca/tl_module.php
+++ b/src/Bundle/Resources/contao/dca/tl_module.php
@@ -23,9 +23,9 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['leaflet_map'] = [
     'label'            => &$GLOBALS['TL_LANG']['tl_module']['leaflet_map'],
     'inputType'        => 'select',
     'exclude'          => true,
-    'options_callback' => ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getMaps'],
+    'options_callback' => ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getMaps'],
     'wizard'           => [
-        ['netzmacht.contao_leaflet_maps.listeners.dca.frontend_integration', 'getEditMapLink'],
+        ['netzmacht.contao_leaflet.listeners.dca.frontend_integration', 'getEditMapLink'],
     ],
     'eval'             => [
         'tl_class' => 'w50 wizard',
diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php
index 8c4d33b..3ce5b4f 100644
--- a/src/Frontend/ContentElement/MapElementFactory.php
+++ b/src/Frontend/ContentElement/MapElementFactory.php
@@ -59,7 +59,7 @@ class MapElementFactory implements ComponentFactory
             $model,
             $this->container->get('templating'),
             $this->container->get('translator'),
-            $this->container->get('netzmacht.contao_leaflet_maps.map.provider'),
+            $this->container->get('netzmacht.contao_leaflet.map.provider'),
             $this->container->get('netzmacht.contao_toolkit.contao.input'),
             $this->container->get('netzmacht.contao_toolkit.contao.config'),
             $column
diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php
index 34c9d70..cac0205 100644
--- a/src/Frontend/Module/MapModuleFactory.php
+++ b/src/Frontend/Module/MapModuleFactory.php
@@ -59,7 +59,7 @@ class MapModuleFactory implements ComponentFactory
             $model,
             $this->container->get('templating'),
             $this->container->get('translator'),
-            $this->container->get('netzmacht.contao_leaflet_maps.map.provider'),
+            $this->container->get('netzmacht.contao_leaflet.map.provider'),
             $this->container->get('netzmacht.contao_toolkit.contao.input'),
             $this->container->get('netzmacht.contao_toolkit.contao.config'),
             $column