diff --git a/src/Zikula/Bundle/ModuleBundle/Resources/config/services.xml b/src/Zikula/Bundle/ModuleBundle/Resources/config/services.xml
index 6ef281cf81..9d527ec374 100644
--- a/src/Zikula/Bundle/ModuleBundle/Resources/config/services.xml
+++ b/src/Zikula/Bundle/ModuleBundle/Resources/config/services.xml
@@ -5,26 +5,26 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-         <parameter key="event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareEventDispatcher</parameter>
-         <parameter key="debug.event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareTraceableEventDispatcher</parameter>
+         <parameter key="event_dispatcher.class">Zikula\Bundle\ModuleBundle\ModuleAwareEventDispatcher</parameter>
+         <parameter key="debug.event_dispatcher.class">Zikula\Bundle\ModuleBundle\ModuleAwareTraceableEventDispatcher</parameter>
     </parameters>
 
     <services>
-        <service id="zikula_modules.routing.loader" class="Zikula\ModuleBundle\ZikulaModuleRoutesLoader" public="false">
+        <service id="zikula_modules.routing.loader" class="Zikula\Bundle\ModuleBundle\ZikulaModuleRoutesLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="kernel" />
         </service>
         
-        <service id="zikula.modules.storage" class="Zikula\ModuleBundle\ModuleService\DoctrineStorage" public="false">
+        <service id="zikula.modules.storage" class="Zikula\Bundle\ModuleBundle\ModuleService\DoctrineStorage" public="false">
             <argument type="service" id="doctrine.orm.default_entity_manager" />
         </service>
         
-        <service id="zikula.modules" class="Zikula\ModuleBundle\DefaultModuleService">
+        <service id="zikula.modules" class="Zikula\Bundle\ModuleBundle\DefaultModuleService">
             <argument type="service" id="zikula.modules.storage" />
             <argument type="service" id="doctrine.orm.default_entity_manager" />
         </service>
         
-        <service id="zikula.controller.resolver" class="Zikula\ModuleBundle\ModuleAwareControllerResolver" public="false">
+        <service id="zikula.controller.resolver" class="Zikula\Bundle\ModuleBundle\ModuleAwareControllerResolver" public="false">
             <argument type="service" id="controller_resolver" />
             <argument type="service" id="kernel" />
         </service>
diff --git a/src/Zikula/Bundle/ThemeBundle/Resources/config/services.xml b/src/Zikula/Bundle/ThemeBundle/Resources/config/services.xml
index 21bf17a065..1b143bd9c9 100644
--- a/src/Zikula/Bundle/ThemeBundle/Resources/config/services.xml
+++ b/src/Zikula/Bundle/ThemeBundle/Resources/config/services.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="zikula.themes.listener" class="Zikula\ThemeBundle\EventListener\ThemeListener">
+        <service id="zikula.themes.listener" class="Zikula\Bundle\ThemeBundle\EventListener\ThemeListener">
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="255"  />
             <argument type="service" id="templating" />
         </service>