Apply naming conventions.

src/Zikula/Bundle/ModuleBundle/Controller/DefaultController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Controller;
+namespace Zikula\ModuleBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;

src/Zikula/Bundle/ModuleBundle/Controller/ModuleController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Zikula\ModulesBundle\Controller;
+namespace Zikula\ModuleBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Zikula\ModulesBundle\Entity\Module;
-use Zikula\ModulesBundle\Form\ModuleType;
+use Zikula\ModuleBundle\Entity\Module;
+use Zikula\ModuleBundle\Form\ModuleType;
 
 /**
  * Module controller.

src/Zikula/Bundle/ModuleBundle/DefaultModuleService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Doctrine\ORM\EntityManager;
 

src/Zikula/Bundle/ModuleBundle/DependencyInjection/Compiler/ControllerResolverCompilerPass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection\Compiler;
+namespace Zikula\ModuleBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 

src/Zikula/Bundle/ModuleBundle/DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

src/Zikula/Bundle/ModuleBundle/DependencyInjection/ReadOnlyDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
 
 /**
  *

src/Zikula/Bundle/ModuleBundle/DependencyInjection/SandboxContainerBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/Zikula/Bundle/ModuleBundle/DependencyInjection/SandboxContainerExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Zikula/Bundle/ModuleBundle/DependencyInjection/ZikulaModulesExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;

src/Zikula/Bundle/ModuleBundle/Entity/Module.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Zikula\ModulesBundle\Entity;
+namespace Zikula\ModuleBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Zikula\ModulesBundle\Entity\Module
+ * Zikula\ModuleBundle\Entity\Module
  *
  * @ORM\Table()
  * @ORM\Entity

src/Zikula/Bundle/ModuleBundle/Exception/InvalidModuleStructureException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Exception;
+namespace Zikula\ModuleBundle\Exception;
 
 /**
  *

src/Zikula/Bundle/ModuleBundle/Exception/InvalidThemeStructureException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Exception;
+namespace Zikula\ModuleBundle\Exception;
 
 /**
  *

src/Zikula/Bundle/ModuleBundle/Form/ModuleType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Form;
+namespace Zikula\ModuleBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilder;

src/Zikula/Bundle/ModuleBundle/ModuleAwareControllerResolver.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\HttpFoundation\Request;

src/Zikula/Bundle/ModuleBundle/ModuleAwareEventDispatcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher;
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/Zikula/Bundle/ModuleBundle/ModuleAwareTraceableEventDispatcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Bundle\FrameworkBundle\Debug\TraceableEventDispatcher;
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/Zikula/Bundle/ModuleBundle/ModuleInstallerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 /**
  * 

src/Zikula/Bundle/ModuleBundle/ModuleService/DoctrineStorage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\ModuleService;
+namespace Zikula\ModuleBundle\ModuleService;
 
 use Doctrine\ORM\EntityManager;
 
@@ -29,13 +29,13 @@ public function get($id)
         return $this->em->find('ZikulaModulesBundle', $id);
     }
 
-    public function insert(\Zikula\ModulesBundle\Entity\Module $module) 
+    public function insert(\Zikula\ModuleBundle\Entity\Module $module) 
     {
         $this->em->persist($module);
         $this->em->flush();
     }
 
-    public function update(\Zikula\ModulesBundle\Entity\Module $module)
+    public function update(\Zikula\ModuleBundle\Entity\Module $module)
     {
         $this->em->persist($module);
         $this->em->flush();

src/Zikula/Bundle/ModuleBundle/ModuleService/StorageInterface.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace Zikula\ModulesBundle\ModuleService;
+namespace Zikula\ModuleBundle\ModuleService;
 
 /**
  * Interface of module metadata storages.
  */
 interface StorageInterface
 {
     /**
-     * @return \Zikula\ModulesBundle\Entity\Module[]
+     * @return \Zikula\ModuleBundle\Entity\Module[]
      */
     public function getAll();
 
     /**
-     * @return \Zikula\ModulesBundle\Entity\Module
+     * @return \Zikula\ModuleBundle\Entity\Module
      */
     public function get($id);
 
-    public function insert(\Zikula\ModulesBundle\Entity\Module $module);
+    public function insert(\Zikula\ModuleBundle\Entity\Module $module);
 
-    public function update(\Zikula\ModulesBundle\Entity\Module $module);
+    public function update(\Zikula\ModuleBundle\Entity\Module $module);
 }
 

src/Zikula/Bundle/ModuleBundle/ModuleServiceInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 /**
  * A module service to install, upgrade and remove modules.

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\ModulesBundle\ModuleAwareEventDispatcher</parameter>
-         <parameter key="debug.event_dispatcher.class">Zikula\ModulesBundle\ModuleAwareTraceableEventDispatcher</parameter>
+         <parameter key="event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareEventDispatcher</parameter>
+         <parameter key="debug.event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareTraceableEventDispatcher</parameter>
     </parameters>
 
     <services>
-        <service id="zikula_modules.routing.loader" class="Zikula\ModulesBundle\ZikulaModuleRoutesLoader" public="false">
+        <service id="zikula_modules.routing.loader" class="Zikula\ModuleBundle\ZikulaModuleRoutesLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="kernel" />
         </service>
 
-        <service id="zikula.modules.storage" class="Zikula\ModulesBundle\ModuleService\DoctrineStorage" public="false">
+        <service id="zikula.modules.storage" class="Zikula\ModuleBundle\ModuleService\DoctrineStorage" public="false">
             <argument type="service" id="doctrine.orm.default_entity_manager" />
         </service>
 
-        <service id="zikula.modules" class="Zikula\ModulesBundle\DefaultModuleService">
+        <service id="zikula.modules" class="Zikula\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\ModulesBundle\ModuleAwareControllerResolver" public="false">
+        <service id="zikula.controller.resolver" class="Zikula\ModuleBundle\ModuleAwareControllerResolver" public="false">
             <argument type="service" id="controller_resolver" />
             <argument type="service" id="kernel" />
         </service>

src/Zikula/Bundle/ModuleBundle/Tests/Controller/DefaultControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Tests\Controller;
+namespace Zikula\ModuleBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 

src/Zikula/Bundle/ModuleBundle/Tests/Controller/ModuleControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle\Tests\Controller;
+namespace Zikula\ModuleBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 

src/Zikula/Bundle/ModuleBundle/ZikulaKernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\ConfigCache;
@@ -131,7 +131,7 @@ private function loadModuleBundlesFromFilesystem()
         foreach($dirs as $dir) {
             $class = sprintf('%s\\%sModule', $dir->getFilename(), $dir->getFilename());
 
-            if(!is_subclass_of($class, 'Zikula\ModulesBundle\ZikulaModule')) {
+            if(!is_subclass_of($class, 'Zikula\ModuleBundle\ZikulaModule')) {
                 throw new Exception\InvalidModuleStructureException($dir->getFilename(). ' # '. $class);
             }
 

src/Zikula/Bundle/ModuleBundle/ZikulaModule.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 

src/Zikula/Bundle/ModuleBundle/ZikulaModulesBundle.php → src/Zikula/Bundle/ModuleBundle/ZikulaModuleBundle.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Zikula/Bundle/ModuleBundle/ZikulaModuleRoutesLoader.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
 
 /**
  *

src/Zikula/Bundle/ThemeBundle/Controller/DefaultController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle\Controller;
+namespace Zikula\ThemeBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;

src/Zikula/Bundle/ThemeBundle/DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle\DependencyInjection;
+namespace Zikula\ThemeBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

src/Zikula/Bundle/ThemeBundle/DependencyInjection/ZikulaThemesExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle\DependencyInjection;
+namespace Zikula\ThemeBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;

src/Zikula/Bundle/ThemeBundle/EventListener/ThemeRenderer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle\EventListener;
+namespace Zikula\ThemeBundle\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 

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\ThemesBundle\EventListener\ThemeRenderer">
+        <service id="zikula.themes.listener" class="Zikula\ThemeBundle\EventListener\ThemeRenderer">
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="255"  />
             <argument type="service" id="templating" />
         </service>

src/Zikula/Bundle/ThemeBundle/Tests/Controller/DefaultControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle\Tests\Controller;
+namespace Zikula\ThemeBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 

src/Zikula/Bundle/ThemeBundle/ZikulaTheme.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle;
+namespace Zikula\ThemeBundle;
 
 /**
  *

src/Zikula/Bundle/ThemeBundle/ZikulaThemesBundle.php → src/Zikula/Bundle/ThemeBundle/ZikulaThemeBundle.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zikula\ThemesBundle;
+namespace Zikula\ThemeBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;