diff --git a/Client.php b/Client.php
index fe700ad..b1a9cc5 100644
--- a/Client.php
+++ b/Client.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
 use Elastica_Client;
-use FOQ\ElasticaBundle\Logger\ElasticaLogger;
+use FOS\ElasticaBundle\Logger\ElasticaLogger;
 
 /**
  * @author Gordon Franke <info@nevalon.de>
diff --git a/Command/PopulateCommand.php b/Command/PopulateCommand.php
index 440333e..0310060 100755
--- a/Command/PopulateCommand.php
+++ b/Command/PopulateCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Command;
+namespace FOS\ElasticaBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -15,17 +15,17 @@ use Symfony\Component\Console\Output\Output;
 class PopulateCommand extends ContainerAwareCommand
 {
     /**
-     * @var FOQ\ElasticaBundle\IndexManager
+     * @var FOS\ElasticaBundle\IndexManager
      */
     private $indexManager;
 
     /**
-     * @var FOQ\ElasticaBundle\Provider\ProviderRegistry
+     * @var FOS\ElasticaBundle\Provider\ProviderRegistry
      */
     private $providerRegistry;
 
     /**
-     * @var FOQ\ElasticaBundle\Resetter
+     * @var FOS\ElasticaBundle\Resetter
      */
     private $resetter;
 
@@ -35,7 +35,7 @@ class PopulateCommand extends ContainerAwareCommand
     protected function configure()
     {
         $this
-            ->setName('foq:elastica:populate')
+            ->setName('fos:elastica:populate')
             ->addOption('index', null, InputOption::VALUE_OPTIONAL, 'The index to repopulate')
             ->addOption('type', null, InputOption::VALUE_OPTIONAL, 'The type to repopulate')
             ->addOption('no-reset', null, InputOption::VALUE_NONE, 'Do not reset index before populating')
@@ -48,9 +48,9 @@ class PopulateCommand extends ContainerAwareCommand
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
-        $this->indexManager = $this->getContainer()->get('foq_elastica.index_manager');
-        $this->providerRegistry = $this->getContainer()->get('foq_elastica.provider_registry');
-        $this->resetter = $this->getContainer()->get('foq_elastica.resetter');
+        $this->indexManager = $this->getContainer()->get('fos_elastica.index_manager');
+        $this->providerRegistry = $this->getContainer()->get('fos_elastica.provider_registry');
+        $this->resetter = $this->getContainer()->get('fos_elastica.resetter');
     }
 
     /**
diff --git a/Command/SearchCommand.php b/Command/SearchCommand.php
index 30712ce..1a878b0 100644
--- a/Command/SearchCommand.php
+++ b/Command/SearchCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Command;
+namespace FOS\ElasticaBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -22,7 +22,7 @@ class SearchCommand extends ContainerAwareCommand
     protected function configure()
     {
         $this
-            ->setName('foq:elastica:search')
+            ->setName('fos:elastica:search')
             ->addArgument('type', InputArgument::REQUIRED, 'The type to search in')
             ->addArgument('query', InputArgument::REQUIRED, 'The text to search')
             ->addOption('index', null, InputOption::VALUE_REQUIRED, 'The index to search in')
@@ -41,7 +41,7 @@ class SearchCommand extends ContainerAwareCommand
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $indexName = $input->getOption('index');
-        $index = $this->getContainer()->get('foq_elastica.index_manager')->getIndex($indexName ? $indexName : null);
+        $index = $this->getContainer()->get('fos_elastica.index_manager')->getIndex($indexName ? $indexName : null);
         $type  = $index->getType($input->getArgument('type'));
         $query = Elastica_Query::create($input->getArgument('query'));
         $query->setLimit($input->getOption('limit'));
diff --git a/Configuration/Search.php b/Configuration/Search.php
index d3cb624..ded65a5 100644
--- a/Configuration/Search.php
+++ b/Configuration/Search.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Configuration;
+namespace FOS\ElasticaBundle\Configuration;
 
 /**
  * Annotation class for setting search repository.
diff --git a/DataCollector/ElasticaDataCollector.php b/DataCollector/ElasticaDataCollector.php
index 2eb3146..22ce3a8 100644
--- a/DataCollector/ElasticaDataCollector.php
+++ b/DataCollector/ElasticaDataCollector.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\DataCollector;
+namespace FOS\ElasticaBundle\DataCollector;
 
-use FOQ\ElasticaBundle\Logger\ElasticaLogger;
+use FOS\ElasticaBundle\Logger\ElasticaLogger;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/DependencyInjection/Compiler/RegisterProvidersPass.php b/DependencyInjection/Compiler/RegisterProvidersPass.php
index fc61e21..f58ea9d 100644
--- a/DependencyInjection/Compiler/RegisterProvidersPass.php
+++ b/DependencyInjection/Compiler/RegisterProvidersPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\DependencyInjection\Compiler;
+namespace FOS\ElasticaBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,15 +21,15 @@ class RegisterProvidersPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('foq_elastica.provider_registry')) {
+        if (!$container->hasDefinition('fos_elastica.provider_registry')) {
             return;
         }
 
         // Infer the default index name from the service alias
-        $defaultIndex = substr($container->getAlias('foq_elastica.index'), 19);
+        $defaultIndex = substr($container->getAlias('fos_elastica.index'), 19);
 
-        $registry = $container->getDefinition('foq_elastica.provider_registry');
-        $providers = $container->findTaggedServiceIds('foq_elastica.provider');
+        $registry = $container->getDefinition('fos_elastica.provider_registry');
+        $providers = $container->findTaggedServiceIds('fos_elastica.provider');
 
         foreach ($providers as $providerId => $tags) {
             $index = $type = null;
@@ -62,7 +62,7 @@ class RegisterProvidersPass implements CompilerPassInterface
     {
         if (!isset($this->implementations[$class])) {
             $refl = new \ReflectionClass($class);
-            $this->implementations[$class] = $refl->implementsInterface('FOQ\ElasticaBundle\Provider\ProviderInterface');
+            $this->implementations[$class] = $refl->implementsInterface('FOS\ElasticaBundle\Provider\ProviderInterface');
         }
 
         return $this->implementations[$class];
diff --git a/DependencyInjection/Compiler/TransformerPass.php b/DependencyInjection/Compiler/TransformerPass.php
index ea7bc85..2c260c9 100644
--- a/DependencyInjection/Compiler/TransformerPass.php
+++ b/DependencyInjection/Compiler/TransformerPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\DependencyInjection\Compiler;
+namespace FOS\ElasticaBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -20,13 +20,13 @@ class TransformerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('foq_elastica.elastica_to_model_transformer.collection.prototype')) {
+        if (!$container->hasDefinition('fos_elastica.elastica_to_model_transformer.collection.prototype')) {
             return;
         }
 
         $transformers = array();
 
-        foreach ($container->findTaggedServiceIds('foq_elastica.elastica_to_model_transformer') as $id => $tags) {
+        foreach ($container->findTaggedServiceIds('fos_elastica.elastica_to_model_transformer') as $id => $tags) {
             foreach ($tags as $tag) {
                 if (empty($tag['index']) || empty($tag['type'])) {
                     throw new InvalidArgumentException('The Transformer must have both a type and an index defined.');
@@ -37,11 +37,11 @@ class TransformerPass implements CompilerPassInterface
         }
 
         foreach ($transformers as $index => $indexTransformers) {
-            if (!$container->hasDefinition(sprintf('foq_elastica.elastica_to_model_transformer.collection.%s', $index))) {
+            if (!$container->hasDefinition(sprintf('fos_elastica.elastica_to_model_transformer.collection.%s', $index))) {
                 continue;
             }
 
-            $index = $container->getDefinition(sprintf('foq_elastica.elastica_to_model_transformer.collection.%s', $index));
+            $index = $container->getDefinition(sprintf('fos_elastica.elastica_to_model_transformer.collection.%s', $index));
             $index->replaceArgument(0, $indexTransformers);
         }
     }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 80c400c..df9793b 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\DependencyInjection;
+namespace FOS\ElasticaBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -22,7 +22,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('foq_elastica', 'array');
+        $rootNode = $treeBuilder->root('fos_elastica', 'array');
 
         $this->addClientsSection($rootNode);
         $this->addIndexesSection($rootNode);
diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php
index d444510..fda0b51 100644
--- a/DependencyInjection/FOQElasticaExtension.php
+++ b/DependencyInjection/FOQElasticaExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\DependencyInjection;
+namespace FOS\ElasticaBundle\DependencyInjection;
 
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -11,7 +11,7 @@ use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Config\FileLocator;
 use InvalidArgumentException;
 
-class FOQElasticaExtension extends Extension
+class FOSElasticaExtension extends Extension
 {
     protected $indexConfigs     = array();
     protected $typeFields       = array();
@@ -48,8 +48,8 @@ class FOQElasticaExtension extends Extension
         $this->loadIndexManager($indexRefsByName, $container);
         $this->loadResetter($this->indexConfigs, $container);
 
-        $container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
-        $container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
+        $container->setAlias('fos_elastica.client', sprintf('fos_elastica.client.%s', $config['default_client']));
+        $container->setAlias('fos_elastica.index', sprintf('fos_elastica.index.%s', $config['default_index']));
 
         $this->createDefaultManagerAlias($config['default_manager'], $container);
     }
@@ -69,10 +69,10 @@ class FOQElasticaExtension extends Extension
     {
         $clientIds = array();
         foreach ($clients as $name => $clientConfig) {
-            $clientDef = $container->getDefinition('foq_elastica.client');
+            $clientDef = $container->getDefinition('fos_elastica.client');
             $clientDef->replaceArgument(0, $clientConfig);
 
-            $clientId = sprintf('foq_elastica.client.%s', $name);
+            $clientId = sprintf('fos_elastica.client.%s', $name);
 
             $container->setDefinition($clientId, $clientDef);
 
@@ -102,10 +102,10 @@ class FOQElasticaExtension extends Extension
             }
 
             $clientId = $clientIdsByName[$clientName];
-            $indexId = sprintf('foq_elastica.index.%s', $name);
+            $indexId = sprintf('fos_elastica.index.%s', $name);
             $indexName = isset($index['index_name']) ? $index['index_name'] : $name;
             $indexDefArgs = array($indexName);
-            $indexDef = new Definition('%foq_elastica.index.class%', $indexDefArgs);
+            $indexDef = new Definition('%fos_elastica.index.class%', $indexDefArgs);
             $indexDef->setFactoryService($clientId);
             $indexDef->setFactoryMethod('getIndex');
             $container->setDefinition($indexId, $indexDef);
@@ -139,13 +139,13 @@ class FOQElasticaExtension extends Extension
      */
     protected function loadIndexFinder(ContainerBuilder $container, $name, $indexId)
     {
-        $abstractTransformerId = 'foq_elastica.elastica_to_model_transformer.collection.prototype';
-        $transformerId = sprintf('foq_elastica.elastica_to_model_transformer.collection.%s', $name);
+        $abstractTransformerId = 'fos_elastica.elastica_to_model_transformer.collection.prototype';
+        $transformerId = sprintf('fos_elastica.elastica_to_model_transformer.collection.%s', $name);
         $transformerDef = new DefinitionDecorator($abstractTransformerId);
         $container->setDefinition($transformerId, $transformerDef);
 
-        $abstractFinderId = 'foq_elastica.finder.prototype';
-        $finderId = sprintf('foq_elastica.finder.%s', $name);
+        $abstractFinderId = 'fos_elastica.finder.prototype';
+        $finderId = sprintf('fos_elastica.finder.%s', $name);
         $finderDef = new DefinitionDecorator($abstractFinderId);
         $finderDef->replaceArgument(0, new Reference($indexId));
         $finderDef->replaceArgument(1, new Reference($transformerId));
@@ -167,7 +167,7 @@ class FOQElasticaExtension extends Extension
             $type = self::deepArrayUnion($typePrototypeConfig, $type);
             $typeId = sprintf('%s.%s', $indexId, $name);
             $typeDefArgs = array($name);
-            $typeDef = new Definition('%foq_elastica.type.class%', $typeDefArgs);
+            $typeDef = new Definition('%fos_elastica.type.class%', $typeDefArgs);
             $typeDef->setFactoryService($indexId);
             $typeDef->setFactoryMethod('getType');
             $container->setDefinition($typeId, $typeDef);
@@ -250,10 +250,10 @@ class FOQElasticaExtension extends Extension
         if (isset($typeConfig['elastica_to_model_transformer']['service'])) {
             return $typeConfig['elastica_to_model_transformer']['service'];
         }
-        $abstractId = sprintf('foq_elastica.elastica_to_model_transformer.prototype.%s', $typeConfig['driver']);
-        $serviceId = sprintf('foq_elastica.elastica_to_model_transformer.%s.%s', $indexName, $typeName);
+        $abstractId = sprintf('fos_elastica.elastica_to_model_transformer.prototype.%s', $typeConfig['driver']);
+        $serviceId = sprintf('fos_elastica.elastica_to_model_transformer.%s.%s', $indexName, $typeName);
         $serviceDef = new DefinitionDecorator($abstractId);
-        $serviceDef->addTag('foq_elastica.elastica_to_model_transformer', array('type' => $typeName, 'index' => $indexName));
+        $serviceDef->addTag('fos_elastica.elastica_to_model_transformer', array('type' => $typeName, 'index' => $indexName));
 
         // Doctrine has a mandatory service as first argument
         $argPos = ('propel' === $typeConfig['driver']) ? 0 : 1;
@@ -273,8 +273,8 @@ class FOQElasticaExtension extends Extension
         if (isset($typeConfig['model_to_elastica_transformer']['service'])) {
             return $typeConfig['model_to_elastica_transformer']['service'];
         }
-        $abstractId = sprintf('foq_elastica.model_to_elastica_transformer.prototype.auto');
-        $serviceId = sprintf('foq_elastica.model_to_elastica_transformer.%s.%s', $indexName, $typeName);
+        $abstractId = sprintf('fos_elastica.model_to_elastica_transformer.prototype.auto');
+        $serviceId = sprintf('fos_elastica.model_to_elastica_transformer.%s.%s', $indexName, $typeName);
         $serviceDef = new DefinitionDecorator($abstractId);
         $serviceDef->replaceArgument(0, array(
             'identifier' => $typeConfig['identifier']
@@ -286,8 +286,8 @@ class FOQElasticaExtension extends Extension
 
     protected function loadObjectPersister(array $typeConfig, Definition $typeDef, ContainerBuilder $container, $indexName, $typeName, $transformerId)
     {
-        $abstractId = sprintf('foq_elastica.object_persister.prototype');
-        $serviceId = sprintf('foq_elastica.object_persister.%s.%s', $indexName, $typeName);
+        $abstractId = sprintf('fos_elastica.object_persister.prototype');
+        $serviceId = sprintf('fos_elastica.object_persister.%s.%s', $indexName, $typeName);
         $serviceDef = new DefinitionDecorator($abstractId);
         $serviceDef->replaceArgument(0, $typeDef);
         $serviceDef->replaceArgument(1, new Reference($transformerId));
@@ -304,9 +304,9 @@ class FOQElasticaExtension extends Extension
             return $typeConfig['provider']['service'];
         }
 
-        $providerId = sprintf('foq_elastica.provider.%s.%s', $indexName, $typeName);
-        $providerDef = new DefinitionDecorator('foq_elastica.provider.prototype.' . $typeConfig['driver']);
-        $providerDef->addTag('foq_elastica.provider', array('index' => $indexName, 'type' => $typeName));
+        $providerId = sprintf('fos_elastica.provider.%s.%s', $indexName, $typeName);
+        $providerDef = new DefinitionDecorator('fos_elastica.provider.prototype.' . $typeConfig['driver']);
+        $providerDef->addTag('fos_elastica.provider', array('index' => $indexName, 'type' => $typeName));
         $providerDef->replaceArgument(0, new Reference($objectPersisterId));
         $providerDef->replaceArgument(1, $typeConfig['model']);
         // Propel provider can simply ignore Doctrine-specific options
@@ -321,8 +321,8 @@ class FOQElasticaExtension extends Extension
         if (isset($typeConfig['listener']['service'])) {
             return $typeConfig['listener']['service'];
         }
-        $abstractListenerId = sprintf('foq_elastica.listener.prototype.%s', $typeConfig['driver']);
-        $listenerId = sprintf('foq_elastica.listener.%s.%s', $indexName, $typeName);
+        $abstractListenerId = sprintf('fos_elastica.listener.prototype.%s', $typeConfig['driver']);
+        $listenerId = sprintf('fos_elastica.listener.%s.%s', $indexName, $typeName);
         $listenerDef = new DefinitionDecorator($abstractListenerId);
         $listenerDef->replaceArgument(0, new Reference($objectPersisterId));
         $listenerDef->replaceArgument(1, $typeConfig['model']);
@@ -372,15 +372,15 @@ class FOQElasticaExtension extends Extension
         if (isset($typeConfig['finder']['service'])) {
             $finderId = $typeConfig['finder']['service'];
         } else {
-            $abstractFinderId = 'foq_elastica.finder.prototype';
-            $finderId = sprintf('foq_elastica.finder.%s.%s', $indexName, $typeName);
+            $abstractFinderId = 'fos_elastica.finder.prototype';
+            $finderId = sprintf('fos_elastica.finder.%s.%s', $indexName, $typeName);
             $finderDef = new DefinitionDecorator($abstractFinderId);
             $finderDef->replaceArgument(0, $typeDef);
             $finderDef->replaceArgument(1, new Reference($elasticaToModelId));
             $container->setDefinition($finderId, $finderDef);
         }
 
-        $managerId = sprintf('foq_elastica.manager.%s', $typeConfig['driver']);
+        $managerId = sprintf('fos_elastica.manager.%s', $typeConfig['driver']);
         $managerDef = $container->getDefinition($managerId);
         $arguments = array( $typeConfig['model'], new Reference($finderId));
         if (isset($typeConfig['repository'])) {
@@ -399,9 +399,9 @@ class FOQElasticaExtension extends Extension
      **/
     protected function loadIndexManager(array $indexRefsByName, ContainerBuilder $container)
     {
-        $managerDef = $container->getDefinition('foq_elastica.index_manager');
+        $managerDef = $container->getDefinition('fos_elastica.index_manager');
         $managerDef->replaceArgument(0, $indexRefsByName);
-        $managerDef->replaceArgument(1, new Reference('foq_elastica.index'));
+        $managerDef->replaceArgument(1, new Reference('fos_elastica.index'));
     }
 
     /**
@@ -411,7 +411,7 @@ class FOQElasticaExtension extends Extension
      **/
     protected function loadResetter(array $indexConfigs, ContainerBuilder $container)
     {
-        $resetterDef = $container->getDefinition('foq_elastica.resetter');
+        $resetterDef = $container->getDefinition('fos_elastica.resetter');
         $resetterDef->replaceArgument(0, $indexConfigs);
     }
 
@@ -439,7 +439,7 @@ class FOQElasticaExtension extends Extension
             $defaultManagerService = $this->loadedDrivers[0];
         }
 
-        $container->setAlias('foq_elastica.manager', sprintf('foq_elastica.manager.%s', $defaultManagerService));
+        $container->setAlias('fos_elastica.manager', sprintf('fos_elastica.manager.%s', $defaultManagerService));
     }
 
 }
diff --git a/Doctrine/AbstractElasticaToModelTransformer.php b/Doctrine/AbstractElasticaToModelTransformer.php
index 9a74cfa..f8e19db 100755
--- a/Doctrine/AbstractElasticaToModelTransformer.php
+++ b/Doctrine/AbstractElasticaToModelTransformer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine;
+namespace FOS\ElasticaBundle\Doctrine;
 
-use FOQ\ElasticaBundle\HybridResult;
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOQ\ElasticaBundle\Transformer\HighlightableModelInterface;
+use FOS\ElasticaBundle\HybridResult;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
+use FOS\ElasticaBundle\Transformer\HighlightableModelInterface;
 use Elastica_Document;
 use Symfony\Component\Form\Util\PropertyPath;
 
diff --git a/Doctrine/AbstractListener.php b/Doctrine/AbstractListener.php
index 796cf19..946948b 100644
--- a/Doctrine/AbstractListener.php
+++ b/Doctrine/AbstractListener.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine;
+namespace FOS\ElasticaBundle\Doctrine;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\Common\Persistence\ObjectManager;
-use FOQ\ElasticaBundle\Persister\ObjectPersisterInterface;
+use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
 
 abstract class AbstractListener implements EventSubscriber
 {
diff --git a/Doctrine/AbstractProvider.php b/Doctrine/AbstractProvider.php
index 6a3e008..43e8c20 100644
--- a/Doctrine/AbstractProvider.php
+++ b/Doctrine/AbstractProvider.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine;
+namespace FOS\ElasticaBundle\Doctrine;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use FOQ\ElasticaBundle\Persister\ObjectPersisterInterface;
-use FOQ\ElasticaBundle\Provider\AbstractProvider as BaseAbstractProvider;
+use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
+use FOS\ElasticaBundle\Provider\AbstractProvider as BaseAbstractProvider;
 
 abstract class AbstractProvider extends BaseAbstractProvider
 {
@@ -29,7 +29,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
     }
 
     /**
-     * @see FOQ\ElasticaBundle\Provider\ProviderInterface::populate()
+     * @see FOS\ElasticaBundle\Provider\ProviderInterface::populate()
      */
     public function populate(\Closure $loggerClosure = null)
     {
diff --git a/Doctrine/MongoDB/ElasticaToModelTransformer.php b/Doctrine/MongoDB/ElasticaToModelTransformer.php
index a2f8813..ce8b5a7 100644
--- a/Doctrine/MongoDB/ElasticaToModelTransformer.php
+++ b/Doctrine/MongoDB/ElasticaToModelTransformer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\MongoDB;
+namespace FOS\ElasticaBundle\Doctrine\MongoDB;
 
-use FOQ\ElasticaBundle\Doctrine\AbstractElasticaToModelTransformer;
+use FOS\ElasticaBundle\Doctrine\AbstractElasticaToModelTransformer;
 use Elastica_Document;
 
 /**
diff --git a/Doctrine/MongoDB/Listener.php b/Doctrine/MongoDB/Listener.php
index 1bddf2f..9fa3536 100644
--- a/Doctrine/MongoDB/Listener.php
+++ b/Doctrine/MongoDB/Listener.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\MongoDB;
+namespace FOS\ElasticaBundle\Doctrine\MongoDB;
 
 use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs;
-use FOQ\ElasticaBundle\Doctrine\AbstractListener;
+use FOS\ElasticaBundle\Doctrine\AbstractListener;
 
 class Listener extends AbstractListener
 {
diff --git a/Doctrine/MongoDB/Provider.php b/Doctrine/MongoDB/Provider.php
index 1d65975..16d9f76 100644
--- a/Doctrine/MongoDB/Provider.php
+++ b/Doctrine/MongoDB/Provider.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\MongoDB;
+namespace FOS\ElasticaBundle\Doctrine\MongoDB;
 
 use Doctrine\ODM\MongoDB\Query\Builder;
-use FOQ\ElasticaBundle\Doctrine\AbstractProvider;
-use FOQ\ElasticaBundle\Exception\InvalidArgumentTypeException;
+use FOS\ElasticaBundle\Doctrine\AbstractProvider;
+use FOS\ElasticaBundle\Exception\InvalidArgumentTypeException;
 
 class Provider extends AbstractProvider
 {
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::countObjects()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::countObjects()
      */
     protected function countObjects($queryBuilder)
     {
@@ -23,7 +23,7 @@ class Provider extends AbstractProvider
     }
 
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::fetchSlice()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::fetchSlice()
      */
     protected function fetchSlice($queryBuilder, $limit, $offset)
     {
@@ -40,7 +40,7 @@ class Provider extends AbstractProvider
     }
 
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::createQueryBuilder()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::createQueryBuilder()
      */
     protected function createQueryBuilder()
     {
diff --git a/Doctrine/ORM/ElasticaToModelTransformer.php b/Doctrine/ORM/ElasticaToModelTransformer.php
index 5ddf733..2ad4d7c 100644
--- a/Doctrine/ORM/ElasticaToModelTransformer.php
+++ b/Doctrine/ORM/ElasticaToModelTransformer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\ORM;
+namespace FOS\ElasticaBundle\Doctrine\ORM;
 
-use FOQ\ElasticaBundle\Doctrine\AbstractElasticaToModelTransformer;
+use FOS\ElasticaBundle\Doctrine\AbstractElasticaToModelTransformer;
 use Elastica_Document;
 use Doctrine\ORM\Query;
 
diff --git a/Doctrine/ORM/Listener.php b/Doctrine/ORM/Listener.php
index c335669..790ddb8 100644
--- a/Doctrine/ORM/Listener.php
+++ b/Doctrine/ORM/Listener.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\ORM;
+namespace FOS\ElasticaBundle\Doctrine\ORM;
 
 use Doctrine\ORM\Event\LifecycleEventArgs;
-use FOQ\ElasticaBundle\Doctrine\AbstractListener;
+use FOS\ElasticaBundle\Doctrine\AbstractListener;
 
 class Listener extends AbstractListener
 {
diff --git a/Doctrine/ORM/Provider.php b/Doctrine/ORM/Provider.php
index 8947536..30e908d 100644
--- a/Doctrine/ORM/Provider.php
+++ b/Doctrine/ORM/Provider.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine\ORM;
+namespace FOS\ElasticaBundle\Doctrine\ORM;
 
 use Doctrine\ORM\QueryBuilder;
-use FOQ\ElasticaBundle\Doctrine\AbstractProvider;
-use FOQ\ElasticaBundle\Exception\InvalidArgumentTypeException;
+use FOS\ElasticaBundle\Doctrine\AbstractProvider;
+use FOS\ElasticaBundle\Exception\InvalidArgumentTypeException;
 
 class Provider extends AbstractProvider
 {
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::countObjects()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::countObjects()
      */
     protected function countObjects($queryBuilder)
     {
@@ -31,7 +31,7 @@ class Provider extends AbstractProvider
     }
 
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::fetchSlice()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::fetchSlice()
      */
     protected function fetchSlice($queryBuilder, $limit, $offset)
     {
@@ -47,7 +47,7 @@ class Provider extends AbstractProvider
     }
 
     /**
-     * @see FOQ\ElasticaBundle\Doctrine\AbstractProvider::createQueryBuilder()
+     * @see FOS\ElasticaBundle\Doctrine\AbstractProvider::createQueryBuilder()
      */
     protected function createQueryBuilder()
     {
diff --git a/Doctrine/RepositoryManager.php b/Doctrine/RepositoryManager.php
index 482759b..5f5d0c8 100644
--- a/Doctrine/RepositoryManager.php
+++ b/Doctrine/RepositoryManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Doctrine;
+namespace FOS\ElasticaBundle\Doctrine;
 
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Persistence\ManagerRegistry;
-use FOQ\ElasticaBundle\Finder\FinderInterface;
-use FOQ\ElasticaBundle\Manager\RepositoryManager as BaseManager;
+use FOS\ElasticaBundle\Finder\FinderInterface;
+use FOS\ElasticaBundle\Manager\RepositoryManager as BaseManager;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
diff --git a/Exception/InvalidArgumentTypeException.php b/Exception/InvalidArgumentTypeException.php
index fc319a8..c41823e 100644
--- a/Exception/InvalidArgumentTypeException.php
+++ b/Exception/InvalidArgumentTypeException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Exception;
+namespace FOS\ElasticaBundle\Exception;
 
 class InvalidArgumentTypeException extends \InvalidArgumentException
 {
diff --git a/FOQElasticaBundle.php b/FOQElasticaBundle.php
index 230035d..5ac1f2a 100644
--- a/FOQElasticaBundle.php
+++ b/FOQElasticaBundle.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
-use FOQ\ElasticaBundle\DependencyInjection\Compiler\RegisterProvidersPass;
-use FOQ\ElasticaBundle\DependencyInjection\Compiler\TransformerPass;
+use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterProvidersPass;
+use FOS\ElasticaBundle\DependencyInjection\Compiler\TransformerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class FOQElasticaBundle extends Bundle
+class FOSElasticaBundle extends Bundle
 {
     /**
      * @see Symfony\Component\HttpKernel\Bundle\Bundle::build()
diff --git a/Finder/FinderInterface.php b/Finder/FinderInterface.php
index 8366cc3..2cc0838 100644
--- a/Finder/FinderInterface.php
+++ b/Finder/FinderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Finder;
+namespace FOS\ElasticaBundle\Finder;
 
 interface FinderInterface
 {
diff --git a/Finder/PaginatedFinderInterface.php b/Finder/PaginatedFinderInterface.php
index b70b283..e26a048 100644
--- a/Finder/PaginatedFinderInterface.php
+++ b/Finder/PaginatedFinderInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Finder;
+namespace FOS\ElasticaBundle\Finder;
 
-use FOQ\ElasticaBundle\Paginator\PaginatorAdapterInterface;
+use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
 use Pagerfanta\Pagerfanta;
 use Elastica_Query;
 
diff --git a/Finder/TransformedFinder.php b/Finder/TransformedFinder.php
index 3bec909..83c954c 100644
--- a/Finder/TransformedFinder.php
+++ b/Finder/TransformedFinder.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Finder;
+namespace FOS\ElasticaBundle\Finder;
 
-use FOQ\ElasticaBundle\Finder\FinderInterface;
-use FOQ\ElasticaBundle\Finder\PaginatedFinderInterface;
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOQ\ElasticaBundle\Paginator\TransformedPaginatorAdapter;
-use FOQ\ElasticaBundle\Paginator\FantaPaginatorAdapter;
+use FOS\ElasticaBundle\Finder\FinderInterface;
+use FOS\ElasticaBundle\Finder\PaginatedFinderInterface;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
+use FOS\ElasticaBundle\Paginator\TransformedPaginatorAdapter;
+use FOS\ElasticaBundle\Paginator\FantaPaginatorAdapter;
 use Pagerfanta\Pagerfanta;
 use Elastica_Searchable;
 use Elastica_Query;
diff --git a/HybridResult.php b/HybridResult.php
index f5c1b07..e2b8245 100644
--- a/HybridResult.php
+++ b/HybridResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
 use Elastica_Result;
 
diff --git a/IndexManager.php b/IndexManager.php
index 5fc30f9..5e84751 100644
--- a/IndexManager.php
+++ b/IndexManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
 class IndexManager
 {
diff --git a/Logger/ElasticaLogger.php b/Logger/ElasticaLogger.php
index 415e53b..a74dbd5 100644
--- a/Logger/ElasticaLogger.php
+++ b/Logger/ElasticaLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Logger;
+namespace FOS\ElasticaBundle\Logger;
 
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 
diff --git a/Manager/RepositoryManager.php b/Manager/RepositoryManager.php
index 3682a2b..7701ec9 100644
--- a/Manager/RepositoryManager.php
+++ b/Manager/RepositoryManager.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Manager;
+namespace FOS\ElasticaBundle\Manager;
 
 use Doctrine\Common\Annotations\Reader;
-use FOQ\ElasticaBundle\Finder\FinderInterface;
+use FOS\ElasticaBundle\Finder\FinderInterface;
 use RuntimeException;
 /**
  * @author Richard Miller <info@limethinking.co.uk>
@@ -58,14 +58,14 @@ class RepositoryManager implements RepositoryManagerInterface
         }
 
         $refClass   = new \ReflectionClass($entityName);
-        $annotation = $this->reader->getClassAnnotation($refClass, 'FOQ\\ElasticaBundle\\Configuration\\Search');
+        $annotation = $this->reader->getClassAnnotation($refClass, 'FOS\\ElasticaBundle\\Configuration\\Search');
         if ($annotation) {
             $this->entities[$entityName]['repositoryName']
                 = $annotation->repositoryClass;
             return $annotation->repositoryClass;
         }
 
-        return 'FOQ\ElasticaBundle\Repository';
+        return 'FOS\ElasticaBundle\Repository';
     }
 
     private function createRepository($entityName)
diff --git a/Manager/RepositoryManagerInterface.php b/Manager/RepositoryManagerInterface.php
index 9340506..c831d35 100644
--- a/Manager/RepositoryManagerInterface.php
+++ b/Manager/RepositoryManagerInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Manager;
+namespace FOS\ElasticaBundle\Manager;
 
-use FOQ\ElasticaBundle\Finder\FinderInterface;
+use FOS\ElasticaBundle\Finder\FinderInterface;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
diff --git a/Paginator/FantaPaginatorAdapter.php b/Paginator/FantaPaginatorAdapter.php
index 07aee7d..4307abc 100644
--- a/Paginator/FantaPaginatorAdapter.php
+++ b/Paginator/FantaPaginatorAdapter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
 use Pagerfanta\Adapter\AdapterInterface;
-use FOQ\ElasticaBundle\Paginator\PaginatorAdapterInterface;
+use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
 
 class FantaPaginatorAdapter implements AdapterInterface
 {
diff --git a/Paginator/PaginatorAdapterInterface.php b/Paginator/PaginatorAdapterInterface.php
index 363fcd3..9b705e6 100644
--- a/Paginator/PaginatorAdapterInterface.php
+++ b/Paginator/PaginatorAdapterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
 interface PaginatorAdapterInterface
 {
@@ -19,7 +19,7 @@ interface PaginatorAdapterInterface
      * @param integer $offset The offset.
      * @param integer $length The length.
      *
-     * @return FOQ\ElasticaBundle\Paginator\PartialResults
+     * @return FOS\ElasticaBundle\Paginator\PartialResults
      *
      * @api
      */
diff --git a/Paginator/PartialResultsInterface.php b/Paginator/PartialResultsInterface.php
index 6afcce7..9efe7f3 100644
--- a/Paginator/PartialResultsInterface.php
+++ b/Paginator/PartialResultsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
 interface PartialResultsInterface
 {
diff --git a/Paginator/RawPaginatorAdapter.php b/Paginator/RawPaginatorAdapter.php
index 77d0527..8dd11f7 100644
--- a/Paginator/RawPaginatorAdapter.php
+++ b/Paginator/RawPaginatorAdapter.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
 use Elastica_Searchable;
 use Elastica_Query;
-use FOQ\ElasticaBundle\Paginator\PaginatorAdapterInterface;
-use FOQ\ElasticaBundle\Paginator\RawPartialResults;
+use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
+use FOS\ElasticaBundle\Paginator\RawPartialResults;
 
 /**
  * Allows pagination of Elastica_Query. Does not map results
@@ -51,7 +51,7 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
     /**
      * Returns the paginated results.
      *
-     * @return FOQ\ElasticaBundle\Paginator\PartialResultInterface
+     * @return FOS\ElasticaBundle\Paginator\PartialResultInterface
      */
     public function getResults($offset, $itemCountPerPage)
     {
diff --git a/Paginator/RawPartialResults.php b/Paginator/RawPartialResults.php
index b1136b9..ed20d10 100644
--- a/Paginator/RawPartialResults.php
+++ b/Paginator/RawPartialResults.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
-use FOQ\ElasticaBundle\Paginator\PartialResultsInterface;
+use FOS\ElasticaBundle\Paginator\PartialResultsInterface;
 use Elastica_ResultSet;
 
 /**
diff --git a/Paginator/TransformedPaginatorAdapter.php b/Paginator/TransformedPaginatorAdapter.php
index 2c424be..89cceb1 100644
--- a/Paginator/TransformedPaginatorAdapter.php
+++ b/Paginator/TransformedPaginatorAdapter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOQ\ElasticaBundle\Paginator\TransformedPartialResults;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
+use FOS\ElasticaBundle\Paginator\TransformedPartialResults;
 use Elastica_Searchable;
 use Elastica_Query;
 
diff --git a/Paginator/TransformedPartialResults.php b/Paginator/TransformedPartialResults.php
index b4a5070..7afd6d4 100644
--- a/Paginator/TransformedPartialResults.php
+++ b/Paginator/TransformedPartialResults.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Paginator;
+namespace FOS\ElasticaBundle\Paginator;
 
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
-use FOQ\ElasticaBundle\Paginator\RawPartialResults;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
+use FOS\ElasticaBundle\Paginator\RawPartialResults;
 use Elastica_ResultSet;
 
 /**
@@ -15,7 +15,7 @@ class TransformedPartialResults extends RawPartialResults
 
     /**
      * @param \Elastica_ResultSet $resultSet
-     * @param \FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface $transformer
+     * @param \FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface $transformer
      */
     public function __construct(Elastica_ResultSet $resultSet, ElasticaToModelTransformerInterface $transformer)
     {
diff --git a/Persister/ObjectPersister.php b/Persister/ObjectPersister.php
index b962945..e95de94 100644
--- a/Persister/ObjectPersister.php
+++ b/Persister/ObjectPersister.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Persister;
+namespace FOS\ElasticaBundle\Persister;
 
-use FOQ\ElasticaBundle\Provider\ProviderInterface;
-use FOQ\ElasticaBundle\Transformer\ModelToElasticaTransformerInterface;
+use FOS\ElasticaBundle\Provider\ProviderInterface;
+use FOS\ElasticaBundle\Transformer\ModelToElasticaTransformerInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Elastica_Type;
 use Elastica_Document;
diff --git a/Persister/ObjectPersisterInterface.php b/Persister/ObjectPersisterInterface.php
index 962a88c..646c141 100644
--- a/Persister/ObjectPersisterInterface.php
+++ b/Persister/ObjectPersisterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Persister;
+namespace FOS\ElasticaBundle\Persister;
 
 /**
  * Inserts, replaces and deletes single documents in an elastica type
diff --git a/Propel/ElasticaToModelTransformer.php b/Propel/ElasticaToModelTransformer.php
index 824b523..b20287f 100644
--- a/Propel/ElasticaToModelTransformer.php
+++ b/Propel/ElasticaToModelTransformer.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Propel;
+namespace FOS\ElasticaBundle\Propel;
 
-use FOQ\ElasticaBundle\HybridResult;
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
+use FOS\ElasticaBundle\HybridResult;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
 use Elastica_Document;
 use Symfony\Component\Form\Util\PropertyPath;
 
diff --git a/Propel/Provider.php b/Propel/Provider.php
index 141a558..f173e72 100644
--- a/Propel/Provider.php
+++ b/Propel/Provider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Propel;
+namespace FOS\ElasticaBundle\Propel;
 
-use FOQ\ElasticaBundle\Provider\AbstractProvider;
+use FOS\ElasticaBundle\Provider\AbstractProvider;
 
 /**
  * Propel provider
@@ -12,7 +12,7 @@ use FOQ\ElasticaBundle\Provider\AbstractProvider;
 class Provider extends AbstractProvider
 {
     /**
-     * @see FOQ\ElasticaBundle\Provider\ProviderInterface::populate()
+     * @see FOS\ElasticaBundle\Provider\ProviderInterface::populate()
      */
     public function populate(\Closure $loggerClosure = null)
     {
diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php
index 04c5b9e..daa57ae 100644
--- a/Provider/AbstractProvider.php
+++ b/Provider/AbstractProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOS\ElasticaBundle\Provider;
 
-use FOQ\ElasticaBundle\Persister\ObjectPersisterInterface;
-use FOQ\ElasticaBundle\Provider\ProviderInterface;
+use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
+use FOS\ElasticaBundle\Provider\ProviderInterface;
 
 abstract class AbstractProvider implements ProviderInterface
 {
diff --git a/Provider/ProviderInterface.php b/Provider/ProviderInterface.php
index 5e81cd6..3c0c8a2 100644
--- a/Provider/ProviderInterface.php
+++ b/Provider/ProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOS\ElasticaBundle\Provider;
 
 /**
  * Insert application domain objects into elastica types
diff --git a/Provider/ProviderRegistry.php b/Provider/ProviderRegistry.php
index e9abe9f..c1d61d6 100644
--- a/Provider/ProviderRegistry.php
+++ b/Provider/ProviderRegistry.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Provider;
+namespace FOS\ElasticaBundle\Provider;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
diff --git a/README.md b/README.md
index 59324d6..dc9df26 100644
--- a/README.md
+++ b/README.md
@@ -43,25 +43,25 @@ Use the master branch with Symfony2 master only, use the 2.0 branch with Symfony
 
 **With submodule**
 
- `git submodule add git://github.com/Exercise/FOQElasticaBundle vendor/bundles/FOQ/ElasticaBundle`
+ `git submodule add git://github.com/Exercise/FOSElasticaBundle vendor/bundles/FOS/ElasticaBundle`
 
 **With clone**
 
- `git clone git://github.com/Exercise/FOQElasticaBundle vendor/bundles/FOQ/ElasticaBundle`
+ `git clone git://github.com/Exercise/FOSElasticaBundle vendor/bundles/FOS/ElasticaBundle`
 
 **With the vendors script**
 
 Add the following lines to your deps file:
 
-    [FOQElasticaBundle]
-        git=git://github.com/Exercise/FOQElasticaBundle.git
-        target=bundles/FOQ/ElasticaBundle
+    [FOSElasticaBundle]
+        git=git://github.com/Exercise/FOSElasticaBundle.git
+        target=bundles/FOS/ElasticaBundle
 
 For the 2.0 branch for use with Symfony2.0.x releases add the following:
 
-    [FOQElasticaBundle]
-        git=git://github.com/Exercise/FOQElasticaBundle.git
-        target=bundles/FOQ/ElasticaBundle
+    [FOSElasticaBundle]
+        git=git://github.com/Exercise/FOSElasticaBundle.git
+        target=bundles/FOS/ElasticaBundle
         version=origin/2.0
 
 Run the vendors script:
@@ -75,7 +75,7 @@ $ php bin/vendors install
 
     $loader->registerNamespaces(array(
         ...
-        'FOQ' => __DIR__.'/../vendor/bundles',
+        'FOS' => __DIR__.'/../vendor/bundles',
     ));
 
 #### Register the bundle
@@ -86,7 +86,7 @@ $ php bin/vendors install
     {
         return array(
             // ...
-            new FOQ\ElasticaBundle\FOQElasticaBundle(),
+            new FOS\ElasticaBundle\FOSElasticaBundle(),
             // ...
         );
     }
@@ -99,7 +99,7 @@ Elasticsearch client is comparable to a database connection.
 Most of the time, you will need only one.
 
     #app/config/config.yml
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
 
@@ -108,7 +108,7 @@ Most of the time, you will need only one.
 Elasticsearch index is comparable to Doctrine entity manager.
 Most of the time, you will need only one.
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -117,14 +117,14 @@ Most of the time, you will need only one.
 
 Here we created a "website" index, that uses our "default" client.
 
-Our index is now available as a service: `foq_elastica.index.website`. It is an instance of `Elastica_Index`.
+Our index is now available as a service: `fos_elastica.index.website`. It is an instance of `Elastica_Index`.
 
 If you need to have different index name from the service name, for example, 
 in order to have different indexes for different environments then you can 
 use the ```index_name``` key to change the index name. The service name will 
 remain the same across the environments:
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -132,13 +132,13 @@ remain the same across the environments:
                 client: default
                 index_name: website_qa
                 
-The service id will be `foq_elastica.index.website` but the underlying index name is website_qa.           
+The service id will be `fos_elastica.index.website` but the underlying index name is website_qa.           
 
 #### Declare a type
 
 Elasticsearch type is comparable to Doctrine entity repository.
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -152,11 +152,11 @@ Elasticsearch type is comparable to Doctrine entity repository.
                             lastName: { boost: 3 }
                             aboutMe: ~
 
-Our type is now available as a service: `foq_elastica.index.website.user`. It is an instance of `Elastica_Type`.
+Our type is now available as a service: `fos_elastica.index.website.user`. It is an instance of `Elastica_Type`.
 
 ### Declaring parent field
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -171,7 +171,7 @@ Our type is now available as a service: `foq_elastica.index.website.user`. It is
 
 ### Declaring `nested` or `object`
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -191,7 +191,7 @@ Our type is now available as a service: `foq_elastica.index.website.user`. It is
 
 ### Populate the types
 
-    php app/console foq:elastica:populate
+    php app/console fos:elastica:populate
 
 This command deletes and creates the declared indexes and types.
 It applies the configured mappings to the types.
@@ -206,7 +206,7 @@ Or, for complete flexibility, go for manual provider.
 If we want to index the entities from a Doctrine repository or a Propel query,
 some configuration will let ElasticaBundle do it for us.
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -262,21 +262,21 @@ You can change this value in the persistence configuration.
 
 #### Manual provider
 
-Create a service with the tag "foq_elastica.provider" and attributes for the
+Create a service with the tag "fos_elastica.provider" and attributes for the
 index and type for which the service will provide.
 
         <service id="acme.search_provider.user" class="Acme\UserBundle\Search\UserProvider">
-            <tag name="foq_elastica.provider" index="website" type="user" />
-            <argument type="service" id="foq_elastica.index.website.user" />
+            <tag name="fos_elastica.provider" index="website" type="user" />
+            <argument type="service" id="fos_elastica.index.website.user" />
         </service>
 
-Its class must implement `FOQ\ElasticaBundle\Provider\ProviderInterface`.
+Its class must implement `FOS\ElasticaBundle\Provider\ProviderInterface`.
 
         <?php
 
         namespace Acme\UserBundle\Provider;
 
-        use FOQ\ElasticaBundle\Provider\ProviderInterface;
+        use FOS\ElasticaBundle\Provider\ProviderInterface;
         use Elastica_Type;
 
         class UserProvider implements ProviderInterface
@@ -305,14 +305,14 @@ Its class must implement `FOQ\ElasticaBundle\Provider\ProviderInterface`.
             }
         }
 
-You will find a more complete implementation example in `src/FOQ/ElasticaBundle/Doctrine/AbstractProvider.php`.
+You will find a more complete implementation example in `src/FOS/ElasticaBundle/Doctrine/AbstractProvider.php`.
 
 ### Search
 
 You can just use the index and type Elastica objects, provided as services, to perform searches.
 
     /** var Elastica_Type */
-    $userType = $this->container->get('foq_elastica.index.website.user');
+    $userType = $this->container->get('fos_elastica.index.website.user');
 
     /** var Elastica_ResultSet */
     $resultSet = $userType->search('bob');
@@ -323,7 +323,7 @@ If your elasticsearch type is bound to a Doctrine entity repository or a Propel
 you can get your entities instead of Elastica results when you perform a search.
 Declare that you want a Doctrine/Propel finder in your configuration:
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -339,10 +339,10 @@ Declare that you want a Doctrine/Propel finder in your configuration:
                             provider: ~
                             finder: ~
 
-You can now use the `foq_elastica.finder.website.user` service:
+You can now use the `fos_elastica.finder.website.user` service:
 
-    /** var FOQ\ElasticaBundle\Finder\TransformedFinder */
-    $finder = $container->get('foq_elastica.finder.website.user');
+    /** var FOS\ElasticaBundle\Finder\TransformedFinder */
+    $finder = $container->get('fos_elastica.finder.website.user');
 
     /** var array of Acme\UserBundle\Entity\User */
     $users = $finder->find('bob');
@@ -366,7 +366,7 @@ You can also get both the Elastica results and the entities together from the fi
 You can then access the score, highlights etc. from the Elastica_Result whilst
 still also getting the entity.
 
-    /** var array of FOQ\ElasticaBundle\HybridResult */
+    /** var array of FOS\ElasticaBundle\HybridResult */
     $hybridResults = $finder->findHybrid('bob');
     foreach ($hybridResults as $hybridResult) {
 
@@ -382,16 +382,16 @@ still also getting the entity.
 You can also define a finder that will work on the entire index. Adjust your index
 configuration as per below:
 
-    foq_elastica:
+    fos_elastica:
         indexes:
             website:
                 client: default
                 finder: ~
 
-You can now use the index wide finder service `foq_elastica.finder.website`:
+You can now use the index wide finder service `fos_elastica.finder.website`:
 
-    /** var FOQ\ElasticaBundle\Finder\MappedFinder */
-    $finder = $container->get('foq_elastica.finder.website');
+    /** var FOS\ElasticaBundle\Finder\MappedFinder */
+    $finder = $container->get('fos_elastica.finder.website');
 
     // Returns a mixed array of any objects mapped
     $results = $finder->find('bob');
@@ -403,10 +403,10 @@ can use a manager service for each driver and get a repository for an entity to
 against. This allows you to use the same service rather than the particular finder. For
 example:
 
-    /** var FOQ\ElasticaBundle\Manager\RepositoryManager */
-    $repositoryManager = $container->get('foq_elastica.manager.orm');
+    /** var FOS\ElasticaBundle\Manager\RepositoryManager */
+    $repositoryManager = $container->get('fos_elastica.manager.orm');
 
-    /** var FOQ\ElasticaBundle\Repository */
+    /** var FOS\ElasticaBundle\Repository */
     $repository = $repositoryManager->getRepository('UserBundle:User');
 
     /** var array of Acme\UserBundle\Entity\User */
@@ -414,7 +414,7 @@ example:
 
 You can also specify the full name of the entity instead of the shortcut syntax:
 
-    /** var FOQ\ElasticaBundle\Repository */
+    /** var FOS\ElasticaBundle\Repository */
     $repository = $repositoryManager->getRepository('Application\UserBundle\Entity\User');
 
 > The **2.0**  branch doesn't support using `UserBundle:User` style syntax and you must use the full name of the entity. .
@@ -422,21 +422,21 @@ You can also specify the full name of the entity instead of the shortcut syntax:
 ##### Default Manager
 
 If you are only using one driver then its manager service is automatically aliased
-to `foq_elastica.manager`. So the above example could be simplified to:
+to `fos_elastica.manager`. So the above example could be simplified to:
 
-    /** var FOQ\ElasticaBundle\Manager\RepositoryManager */
-    $repositoryManager = $container->get('foq_elastica.manager');
+    /** var FOS\ElasticaBundle\Manager\RepositoryManager */
+    $repositoryManager = $container->get('fos_elastica.manager');
 
-    /** var FOQ\ElasticaBundle\Repository */
+    /** var FOS\ElasticaBundle\Repository */
     $repository = $repositoryManager->getRepository('UserBundle:User');
 
     /** var array of Acme\UserBundle\Entity\User */
     $users = $repository->find('bob');
 
-If you use multiple drivers then you can choose which one is aliased to `foq_elastica.manager`
+If you use multiple drivers then you can choose which one is aliased to `fos_elastica.manager`
 using the `default_manager` parameter:
 
-    foq_elastica:
+    fos_elastica:
         default_manager: mongodb #defauults to orm
         clients:
             default: { host: localhost, port: 9200 }
@@ -445,7 +445,7 @@ using the `default_manager` parameter:
 ##### Custom Repositories
 
 As well as the default repository you can create a custom repository for an entity and add
-methods for particular searches. These need to extend `FOQ\ElasticaBundle\Repository` to have
+methods for particular searches. These need to extend `FOS\ElasticaBundle\Repository` to have
 access to the finder:
 
 ```
@@ -453,7 +453,7 @@ access to the finder:
 
 namespace Acme\ElasticaBundle\SearchRepository;
 
-use FOQ\ElasticaBundle\Repository;
+use FOS\ElasticaBundle\Repository;
 
 class UserRepository extends Repository
 {
@@ -467,7 +467,7 @@ class UserRepository extends Repository
 
 To use the custom repository specify it in the mapping for the entity:
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -486,10 +486,10 @@ To use the custom repository specify it in the mapping for the entity:
 
 Then the custom queries will be available when using the repository returned from the manager:
 
-    /** var FOQ\ElasticaBundle\Manager\RepositoryManager */
-    $repositoryManager = $container->get('foq_elastica.manager');
+    /** var FOS\ElasticaBundle\Manager\RepositoryManager */
+    $repositoryManager = $container->get('fos_elastica.manager');
 
-    /** var FOQ\ElasticaBundle\Repository */
+    /** var FOS\ElasticaBundle\Repository */
     $repository = $repositoryManager->getRepository('UserBundle:User');
 
     /** var array of Acme\UserBundle\Entity\User */
@@ -502,7 +502,7 @@ Alternatively you can specify the custom repository using an annotation in the e
 
 namespace Application\UserBundle\Entity;
 
-use FOQ\ElasticaBundle\Configuration\Search;
+use FOS\ElasticaBundle\Configuration\Search;
 
 /**
  * @Search(repositoryClass="Acme\ElasticaBundle\SearchRepository\UserRepository")
@@ -521,7 +521,7 @@ If you use the Doctrine integration, you can let ElasticaBundle update the index
 when an object is added, updated or removed. It uses Doctrine lifecycle events.
 Declare that you want to update the index in real time:
 
-    foq_elastica:
+    fos_elastica:
         clients:
             default: { host: localhost, port: 9200 }
         indexes:
@@ -583,7 +583,7 @@ The delete listener disregards the callback.
 
 Any setting can be specified when declaring a type. For example, to enable a custom analyzer, you could write:
 
-    foq_elastica:
+    fos_elastica:
         indexes:
             doc:
                 settings:
@@ -612,7 +612,7 @@ issuing a request will result in an `Elastica_Exception_Client` being thrown.
 Depending on your needs, it may be desirable to suppress these exceptions and
 allow searches to fail silently.
 
-One way to achieve this is to override the `foq_elastica.client.class` service
+One way to achieve this is to override the `fos_elastica.client.class` service
 container parameter with a custom class. In the following example, we override
 the `Client::request()` method and return the equivalent of an empty search
 response if an exception occurred.
@@ -622,7 +622,7 @@ response if an exception occurred.
 
 namespace Acme\ElasticaBundle;
 
-use FOQ\ElasticaBundle\Client as BaseClient;
+use FOS\ElasticaBundle\Client as BaseClient;
 
 class Client extends BaseClient
 {
@@ -648,7 +648,7 @@ Results must match at least one specified `categoryIds`, and should match the
 apply to queries against the `title` field.
 
 ```php
-$finder = $this->container->get('foq_elastica.finder.website.article');
+$finder = $this->container->get('fos_elastica.finder.website.article');
 $boolQuery = new \Elastica_Query_Bool();
 
 $fieldQuery = new \Elastica_Query_Text();
@@ -670,7 +670,7 @@ $data = $finder->find($boolQuery);
 Configuration:
 
 ```yaml
-foq_elastica:
+fos_elastica:
     clients:
         default: { host: localhost, port: 9200 }
     indexes:
diff --git a/Repository.php b/Repository.php
index 503973e..dde07c6 100644
--- a/Repository.php
+++ b/Repository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
-use FOQ\ElasticaBundle\Finder\PaginatedFinderInterface;
+use FOS\ElasticaBundle\Finder\PaginatedFinderInterface;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
diff --git a/Resetter.php b/Resetter.php
index 2773140..5557ac7 100644
--- a/Resetter.php
+++ b/Resetter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle;
+namespace FOS\ElasticaBundle;
 
 /**
  * Deletes and recreates indexes
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index b6b9c92..0a2fd05 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -5,71 +5,71 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="foq_elastica.client.class">FOQ\ElasticaBundle\Client</parameter>
-        <parameter key="foq_elastica.index.class">Elastica_Index</parameter>
-        <parameter key="foq_elastica.type.class">Elastica_Type</parameter>
-        <parameter key="foq_elastica.logger.class">FOQ\ElasticaBundle\Logger\ElasticaLogger</parameter>
-        <parameter key="foq_elastica.data_collector.class">FOQ\ElasticaBundle\DataCollector\ElasticaDataCollector</parameter>
-        <parameter key="foq_elastica.manager.class">FOQ\ElasticaBundle\Manager\RepositoryManager</parameter>
-        <parameter key="foq_elastica.elastica_to_model_transformer.collection.class">FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection</parameter>
-        <parameter key="foq_elastica.provider_registry.class">FOQ\ElasticaBundle\Provider\ProviderRegistry</parameter>
+        <parameter key="fos_elastica.client.class">FOS\ElasticaBundle\Client</parameter>
+        <parameter key="fos_elastica.index.class">Elastica_Index</parameter>
+        <parameter key="fos_elastica.type.class">Elastica_Type</parameter>
+        <parameter key="fos_elastica.logger.class">FOS\ElasticaBundle\Logger\ElasticaLogger</parameter>
+        <parameter key="fos_elastica.data_collector.class">FOS\ElasticaBundle\DataCollector\ElasticaDataCollector</parameter>
+        <parameter key="fos_elastica.manager.class">FOS\ElasticaBundle\Manager\RepositoryManager</parameter>
+        <parameter key="fos_elastica.elastica_to_model_transformer.collection.class">FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection</parameter>
+        <parameter key="fos_elastica.provider_registry.class">FOS\ElasticaBundle\Provider\ProviderRegistry</parameter>
     </parameters>
 
     <services>
 
-        <service id="foq_elastica.logger" class="%foq_elastica.logger.class%">
+        <service id="fos_elastica.logger" class="%fos_elastica.logger.class%">
             <argument type="service" id="logger" on-invalid="null" />
             <argument>%kernel.debug%</argument>
             <tag name="monolog.logger" channel="elastica" />
         </service>
-        <service id="foq_elastica.data_collector" class="%foq_elastica.data_collector.class%" public="true">
-            <tag name="data_collector" template="FOQElasticaBundle:Collector:elastica" id="elastica" />
-            <argument type="service" id="foq_elastica.logger" />
+        <service id="fos_elastica.data_collector" class="%fos_elastica.data_collector.class%" public="true">
+            <tag name="data_collector" template="FOSElasticaBundle:Collector:elastica" id="elastica" />
+            <argument type="service" id="fos_elastica.logger" />
         </service>
 
-        <service id="foq_elastica.client" class="%foq_elastica.client.class%">
+        <service id="fos_elastica.client" class="%fos_elastica.client.class%">
             <argument /> <!-- config -->
             <call method="setLogger">
-                <argument type="service" id="foq_elastica.logger" />
+                <argument type="service" id="fos_elastica.logger" />
             </call>
         </service>
 
-        <service id="foq_elastica.index_manager" class="FOQ\ElasticaBundle\IndexManager">
+        <service id="fos_elastica.index_manager" class="FOS\ElasticaBundle\IndexManager">
             <argument /> <!-- indexes -->
             <argument /> <!-- default index -->
         </service>
 
-        <service id="foq_elastica.resetter" class="FOQ\ElasticaBundle\Resetter">
+        <service id="fos_elastica.resetter" class="FOS\ElasticaBundle\Resetter">
             <argument /> <!-- index configs -->
         </service>
 
-        <service id="foq_elastica.object_persister.prototype" class="FOQ\ElasticaBundle\Persister\ObjectPersister" abstract="true">
+        <service id="fos_elastica.object_persister.prototype" class="FOS\ElasticaBundle\Persister\ObjectPersister" abstract="true">
             <argument /> <!-- type -->
             <argument /> <!-- model to elastica transformer -->
             <argument /> <!-- model -->
             <argument /> <!-- properties mapping -->
         </service>
 
-        <service id="foq_elastica.finder.prototype" class="FOQ\ElasticaBundle\Finder\TransformedFinder" public="true" abstract="true">
+        <service id="fos_elastica.finder.prototype" class="FOS\ElasticaBundle\Finder\TransformedFinder" public="true" abstract="true">
             <argument /> <!-- searchable -->
             <argument /> <!-- transformer -->
         </service>
 
-        <service id="foq_elastica.model_to_elastica_transformer.prototype.auto" class="FOQ\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer" public="false" abstract="true">
+        <service id="fos_elastica.model_to_elastica_transformer.prototype.auto" class="FOS\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer" public="false" abstract="true">
             <argument /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.collection.prototype" class="%foq_elastica.elastica_to_model_transformer.collection.class%" public="true" abstract="true">
+        <service id="fos_elastica.elastica_to_model_transformer.collection.prototype" class="%fos_elastica.elastica_to_model_transformer.collection.class%" public="true" abstract="true">
             <argument type="collection" /> <!-- transformers -->
         </service>
 
-        <service id="foq_elastica.provider_registry" class="%foq_elastica.provider_registry.class%">
+        <service id="fos_elastica.provider_registry" class="%fos_elastica.provider_registry.class%">
             <call method="setContainer">
                 <argument type="service" id="service_container" />
             </call>
         </service>
 
-        <service id="foq_elastica.paginator.subscriber" class="FOQ\ElasticaBundle\Subscriber\PaginateElasticaQuerySubscriber">
+        <service id="fos_elastica.paginator.subscriber" class="FOS\ElasticaBundle\Subscriber\PaginateElasticaQuerySubscriber">
             <tag name="knp_paginator.subscriber" />
         </service>
     </services>
diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
index 6d46dff..53c82f9 100644
--- a/Resources/config/mongodb.xml
+++ b/Resources/config/mongodb.xml
@@ -6,27 +6,27 @@
 
     <services>
 
-        <service id="foq_elastica.provider.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\Provider" public="true" abstract="true">
+        <service id="fos_elastica.provider.prototype.mongodb" class="FOS\ElasticaBundle\Doctrine\MongoDB\Provider" public="true" abstract="true">
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
             <argument type="service" id="doctrine_mongodb" />
         </service>
 
-        <service id="foq_elastica.listener.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\Listener" public="false" abstract="true">
+        <service id="fos_elastica.listener.prototype.mongodb" class="FOS\ElasticaBundle\Doctrine\MongoDB\Listener" public="false" abstract="true">
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- events -->
             <argument/> <!-- identifier -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\ElasticaToModelTransformer" public="false">
+        <service id="fos_elastica.elastica_to_model_transformer.prototype.mongodb" class="FOS\ElasticaBundle\Doctrine\MongoDB\ElasticaToModelTransformer" public="false">
             <argument type="service" id="doctrine_mongodb" />
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.manager.mongodb" class="FOQ\ElasticaBundle\Doctrine\RepositoryManager">
+        <service id="fos_elastica.manager.mongodb" class="FOS\ElasticaBundle\Doctrine\RepositoryManager">
             <argument type="service" id="doctrine_mongodb"/>
             <argument type="service" id="annotation_reader"/>
         </service>
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index 67215a1..b47cfc1 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -6,14 +6,14 @@
 
     <services>
 
-        <service id="foq_elastica.provider.prototype.orm" class="FOQ\ElasticaBundle\Doctrine\ORM\Provider" public="true" abstract="true">
+        <service id="fos_elastica.provider.prototype.orm" class="FOS\ElasticaBundle\Doctrine\ORM\Provider" public="true" abstract="true">
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
             <argument type="service" id="doctrine" />
         </service>
 
-        <service id="foq_elastica.listener.prototype.orm" class="FOQ\ElasticaBundle\Doctrine\ORM\Listener" public="false" abstract="true">
+        <service id="fos_elastica.listener.prototype.orm" class="FOS\ElasticaBundle\Doctrine\ORM\Listener" public="false" abstract="true">
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- events -->
@@ -21,13 +21,13 @@
             <argument /> <!-- check method -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.prototype.orm" class="FOQ\ElasticaBundle\Doctrine\ORM\ElasticaToModelTransformer" public="false">
+        <service id="fos_elastica.elastica_to_model_transformer.prototype.orm" class="FOS\ElasticaBundle\Doctrine\ORM\ElasticaToModelTransformer" public="false">
             <argument type="service" id="doctrine" />
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.manager.orm" class="FOQ\ElasticaBundle\Doctrine\RepositoryManager">
+        <service id="fos_elastica.manager.orm" class="FOS\ElasticaBundle\Doctrine\RepositoryManager">
             <argument type="service" id="doctrine"/>
             <argument type="service" id="annotation_reader"/>
         </service>
diff --git a/Resources/config/propel.xml b/Resources/config/propel.xml
index e8fd744..a6fc32f 100644
--- a/Resources/config/propel.xml
+++ b/Resources/config/propel.xml
@@ -5,18 +5,18 @@
 
     <services>
 
-        <service id="foq_elastica.provider.prototype.propel" class="FOQ\ElasticaBundle\Propel\Provider" public="true" abstract="true">
+        <service id="fos_elastica.provider.prototype.propel" class="FOS\ElasticaBundle\Propel\Provider" public="true" abstract="true">
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.elastica_to_model_transformer.prototype.propel" class="FOQ\ElasticaBundle\Propel\ElasticaToModelTransformer" public="false">
+        <service id="fos_elastica.elastica_to_model_transformer.prototype.propel" class="FOS\ElasticaBundle\Propel\ElasticaToModelTransformer" public="false">
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="foq_elastica.manager.propel" class="%foq_elastica.manager.class%">
+        <service id="fos_elastica.manager.propel" class="%fos_elastica.manager.class%">
             <argument type="service" id="annotation_reader"/>
         </service>
 
diff --git a/Resources/views/Collector/elastica.html.twig b/Resources/views/Collector/elastica.html.twig
index f63e8cf..137dcdb 100644
--- a/Resources/views/Collector/elastica.html.twig
+++ b/Resources/views/Collector/elastica.html.twig
@@ -20,7 +20,7 @@
 
 {% block menu %}
 <span class="label">
-    <span class="icon"><img src="{{ asset('bundles/foqelastica/images/elastica.png') }}" alt="" /></span>
+    <span class="icon"><img src="{{ asset('bundles/foselastica/images/elastica.png') }}" alt="" /></span>
     <strong>Elastica</strong>
     <span class="count">
         <span>{{ collector.querycount }}</span>
diff --git a/Subscriber/PaginateElasticaQuerySubscriber.php b/Subscriber/PaginateElasticaQuerySubscriber.php
index 2f043ef..50cf36c 100644
--- a/Subscriber/PaginateElasticaQuerySubscriber.php
+++ b/Subscriber/PaginateElasticaQuerySubscriber.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Subscriber;
+namespace FOS\ElasticaBundle\Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Knp\Component\Pager\Event\ItemsEvent;
-use FOQ\ElasticaBundle\Paginator\PaginatorAdapterInterface;
+use FOS\ElasticaBundle\Paginator\PaginatorAdapterInterface;
 
 class PaginateElasticaQuerySubscriber implements EventSubscriberInterface
 {
diff --git a/Tests/DataCollector/ElasticaDataCollectorTest.php b/Tests/DataCollector/ElasticaDataCollectorTest.php
index 7ec9800..753809a 100644
--- a/Tests/DataCollector/ElasticaDataCollectorTest.php
+++ b/Tests/DataCollector/ElasticaDataCollectorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\DataCollector;
+namespace FOS\ElasticaBundle\Tests\DataCollector;
 
-use FOQ\ElasticaBundle\DataCollector\ElasticaDataCollector;
+use FOS\ElasticaBundle\DataCollector\ElasticaDataCollector;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
@@ -20,7 +20,7 @@ class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $loggerMock = $this->getMockBuilder('FOQ\ElasticaBundle\Logger\ElasticaLogger')
+        $loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -45,7 +45,7 @@ class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $loggerMock = $this->getMockBuilder('FOQ\ElasticaBundle\Logger\ElasticaLogger')
+        $loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -70,7 +70,7 @@ class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $loggerMock = $this->getMockBuilder('FOQ\ElasticaBundle\Logger\ElasticaLogger')
+        $loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/Tests/DependencyInjection/Compiler/RegisterProvidersPassTest.php b/Tests/DependencyInjection/Compiler/RegisterProvidersPassTest.php
index dbbfcb0..22ae430 100644
--- a/Tests/DependencyInjection/Compiler/RegisterProvidersPassTest.php
+++ b/Tests/DependencyInjection/Compiler/RegisterProvidersPassTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\DependencyInjection\Compiler;
+namespace FOS\ElasticaBundle\Tests\DependencyInjection\Compiler;
 
-use FOQ\ElasticaBundle\DependencyInjection\Compiler\RegisterProvidersPass;
+use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterProvidersPass;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -15,8 +15,8 @@ class RegisterProvidersPassTest extends \PHPUnit_Framework_TestCase
 
         $registryDefinition = new Definition();
 
-        $container->setDefinition('foq_elastica.provider_registry', $registryDefinition);
-        $container->setAlias('foq_elastica.index', 'foq_elastica.index.foo');
+        $container->setDefinition('fos_elastica.provider_registry', $registryDefinition);
+        $container->setAlias('fos_elastica.index', 'fos_elastica.index.foo');
 
         $container->setDefinition('provider.foo.a', $this->createProviderDefinition(array('type' => 'a')));
         $container->setDefinition('provider.foo.b', $this->createProviderDefinition(array('index' => 'foo', 'type' => 'b')));
@@ -39,8 +39,8 @@ class RegisterProvidersPassTest extends \PHPUnit_Framework_TestCase
         $container = new ContainerBuilder();
         $pass = new RegisterProvidersPass();
 
-        $container->setDefinition('foq_elastica.provider_registry', new Definition());
-        $container->setAlias('foq_elastica.index', 'foq_elastica.index.foo');
+        $container->setDefinition('fos_elastica.provider_registry', new Definition());
+        $container->setAlias('fos_elastica.index', 'fos_elastica.index.foo');
 
         $providerDef = $this->createProviderDefinition();
         $providerDef->setClass('stdClass');
@@ -58,8 +58,8 @@ class RegisterProvidersPassTest extends \PHPUnit_Framework_TestCase
         $container = new ContainerBuilder();
         $pass = new RegisterProvidersPass();
 
-        $container->setDefinition('foq_elastica.provider_registry', new Definition());
-        $container->setAlias('foq_elastica.index', 'foq_elastica.index.foo');
+        $container->setDefinition('fos_elastica.provider_registry', new Definition());
+        $container->setAlias('fos_elastica.index', 'fos_elastica.index.foo');
 
         $container->setDefinition('provider.foo.a', $this->createProviderDefinition());
 
@@ -68,10 +68,10 @@ class RegisterProvidersPassTest extends \PHPUnit_Framework_TestCase
 
     private function createProviderDefinition(array $attributes = array())
     {
-        $provider = $this->getMock('FOQ\ElasticaBundle\Provider\ProviderInterface');
+        $provider = $this->getMock('FOS\ElasticaBundle\Provider\ProviderInterface');
 
         $definition = new Definition(get_class($provider));
-        $definition->addTag('foq_elastica.provider', $attributes);
+        $definition->addTag('fos_elastica.provider', $attributes);
 
         return $definition;
     }
diff --git a/Tests/Doctrine/AbstractListenerTest.php b/Tests/Doctrine/AbstractListenerTest.php
index 16845e9..d6a8ee3 100644
--- a/Tests/Doctrine/AbstractListenerTest.php
+++ b/Tests/Doctrine/AbstractListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine;
+namespace FOS\ElasticaBundle\Tests\Doctrine;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
@@ -154,7 +154,7 @@ abstract class AbstractListenerTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidIsIndexableCallbacks($isIndexableCallback)
     {
-        $listener = $this->createListener($this->getMockPersister(), 'FOQ\ElasticaBundle\Tests\Doctrine\Listener\Entity', array());
+        $listener = $this->createListener($this->getMockPersister(), 'FOS\ElasticaBundle\Tests\Doctrine\Listener\Entity', array());
         $listener->setIsIndexableCallback($isIndexableCallback);
     }
 
@@ -214,11 +214,11 @@ abstract class AbstractListenerTest extends \PHPUnit_Framework_TestCase
 
     private function getMockPersister()
     {
-        return $this->getMock('FOQ\ElasticaBundle\Persister\ObjectPersisterInterface');
+        return $this->getMock('FOS\ElasticaBundle\Persister\ObjectPersisterInterface');
     }
 }
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine\Listener;
+namespace FOS\ElasticaBundle\Tests\Doctrine\Listener;
 
 class Entity
 {
diff --git a/Tests/Doctrine/AbstractProviderTest.php b/Tests/Doctrine/AbstractProviderTest.php
index 9cc7bd5..8c1be54 100644
--- a/Tests/Doctrine/AbstractProviderTest.php
+++ b/Tests/Doctrine/AbstractProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine;
+namespace FOS\ElasticaBundle\Tests\Doctrine;
 
 class AbstractProviderTest extends \PHPUnit_Framework_TestCase
 {
@@ -136,11 +136,11 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @return FOQ\ElasticaBundle\Doctrine\AbstractProvider
+     * @return FOS\ElasticaBundle\Doctrine\AbstractProvider
      */
     private function getMockAbstractProvider()
     {
-        return $this->getMockForAbstractClass('FOQ\ElasticaBundle\Doctrine\AbstractProvider', array(
+        return $this->getMockForAbstractClass('FOS\ElasticaBundle\Doctrine\AbstractProvider', array(
             $this->objectPersister,
             $this->objectClass,
             $this->options,
@@ -157,7 +157,7 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @return FOQ\ElasticaBundle\Tests\Doctrine\ObjectManager
+     * @return FOS\ElasticaBundle\Tests\Doctrine\ObjectManager
      */
     private function getMockObjectManager()
     {
@@ -165,11 +165,11 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @return FOQ\ElasticaBundle\Persister\ObjectPersisterInterface
+     * @return FOS\ElasticaBundle\Persister\ObjectPersisterInterface
      */
     private function getMockObjectPersister()
     {
-        return $this->getMock('FOQ\ElasticaBundle\Persister\ObjectPersisterInterface');
+        return $this->getMock('FOS\ElasticaBundle\Persister\ObjectPersisterInterface');
     }
 }
 
diff --git a/Tests/Doctrine/MongoDB/ListenerTest.php b/Tests/Doctrine/MongoDB/ListenerTest.php
index bfc3b5c..7f1a9ab 100644
--- a/Tests/Doctrine/MongoDB/ListenerTest.php
+++ b/Tests/Doctrine/MongoDB/ListenerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine\MongoDB;
+namespace FOS\ElasticaBundle\Tests\Doctrine\MongoDB;
 
-use FOQ\ElasticaBundle\Tests\Doctrine\AbstractListenerTest;
+use FOS\ElasticaBundle\Tests\Doctrine\AbstractListenerTest;
 
 class ListenerTest extends AbstractListenerTest
 {
@@ -25,7 +25,7 @@ class ListenerTest extends AbstractListenerTest
 
     protected function getListenerClass()
     {
-        return 'FOQ\ElasticaBundle\Doctrine\MongoDB\Listener';
+        return 'FOS\ElasticaBundle\Doctrine\MongoDB\Listener';
     }
 
     protected function getObjectManagerClass()
diff --git a/Tests/Doctrine/ORM/ListenerTest.php b/Tests/Doctrine/ORM/ListenerTest.php
index c21afb4..48702c0 100644
--- a/Tests/Doctrine/ORM/ListenerTest.php
+++ b/Tests/Doctrine/ORM/ListenerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine\ORM;
+namespace FOS\ElasticaBundle\Tests\Doctrine\ORM;
 
-use FOQ\ElasticaBundle\Tests\Doctrine\AbstractListenerTest;
+use FOS\ElasticaBundle\Tests\Doctrine\AbstractListenerTest;
 
 class ListenerTest extends AbstractListenerTest
 {
@@ -25,7 +25,7 @@ class ListenerTest extends AbstractListenerTest
 
     protected function getListenerClass()
     {
-        return 'FOQ\ElasticaBundle\Doctrine\ORM\Listener';
+        return 'FOS\ElasticaBundle\Doctrine\ORM\Listener';
     }
 
     protected function getObjectManagerClass()
diff --git a/Tests/Doctrine/RepositoryManagerTest.php b/Tests/Doctrine/RepositoryManagerTest.php
index d518b0c..727a3a5 100644
--- a/Tests/Doctrine/RepositoryManagerTest.php
+++ b/Tests/Doctrine/RepositoryManagerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Doctrine;
+namespace FOS\ElasticaBundle\Tests\Doctrine;
 
-use FOQ\ElasticaBundle\Doctrine\RepositoryManager;
+use FOS\ElasticaBundle\Doctrine\RepositoryManager;
 
 class CustomRepository{}
 
@@ -22,7 +22,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testThatGetRepositoryReturnsDefaultRepository()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -34,17 +34,17 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($registryMock, $readerMock);
         $manager->addEntity($entityName, $finderMock);
         $repository = $manager->getRepository($entityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
+        $this->assertInstanceOf('FOS\ElasticaBundle\Repository', $repository);
     }
 
     public function testThatGetRepositoryReturnsCustomRepository()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -56,12 +56,12 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($registryMock, $readerMock);
-        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\Manager\CustomRepository');
+        $manager->addEntity($entityName, $finderMock, 'FOS\ElasticaBundle\Tests\Manager\CustomRepository');
         $repository = $manager->getRepository($entityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
+        $this->assertInstanceOf('FOS\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
     }
 
     /**
@@ -69,7 +69,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
      */
     public function testThatGetRepositoryThrowsExceptionIfEntityNotConfigured()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -81,7 +81,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($registryMock, $readerMock);
         $manager->addEntity($entityName, $finderMock);
@@ -93,7 +93,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
      */
     public function testThatGetRepositoryThrowsExceptionIfCustomRepositoryNotFound()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -105,16 +105,16 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($registryMock, $readerMock);
-        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\MissingRepository');
+        $manager->addEntity($entityName, $finderMock, 'FOS\ElasticaBundle\Tests\MissingRepository');
         $manager->getRepository('Missing Entity');
     }
 
     public function testThatGetRepositoryWorksWithShortEntityName()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -127,9 +127,9 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->getMock();
 
         $shortEntityName = 'TestBundle:Entity';
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
         $shortPath = 'TestBundle';
-        $fullPath = 'FOQ\ElasticaBundle\Tests\Manager';
+        $fullPath = 'FOS\ElasticaBundle\Tests\Manager';
 
         $registryMock->expects($this->once())
             ->method('getAliasNamespace')
@@ -139,7 +139,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
         $manager = new RepositoryManager($registryMock, $readerMock);
         $manager->addEntity($entityName, $finderMock);
         $repository = $manager->getRepository($shortEntityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
+        $this->assertInstanceOf('FOS\ElasticaBundle\Repository', $repository);
     }
 
 }
diff --git a/Tests/IndexManagerTest.php b/Tests/IndexManagerTest.php
index 63e6ded..884a864 100644
--- a/Tests/IndexManagerTest.php
+++ b/Tests/IndexManagerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\IndexManager;
+namespace FOS\ElasticaBundle\Tests\IndexManager;
 
-use FOQ\ElasticaBundle\IndexManager;
+use FOS\ElasticaBundle\IndexManager;
 
 class IndexManagerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/Logger/ElasticaLoggerTest.php b/Tests/Logger/ElasticaLoggerTest.php
index 566757c..32b152d 100644
--- a/Tests/Logger/ElasticaLoggerTest.php
+++ b/Tests/Logger/ElasticaLoggerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Logger;
+namespace FOS\ElasticaBundle\Tests\Logger;
 
-use FOQ\ElasticaBundle\Logger\ElasticaLogger;
+use FOS\ElasticaBundle\Logger\ElasticaLogger;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
diff --git a/Tests/Manager/RepositoryManagerTest.php b/Tests/Manager/RepositoryManagerTest.php
index 484bf12..d6be333 100644
--- a/Tests/Manager/RepositoryManagerTest.php
+++ b/Tests/Manager/RepositoryManagerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Manager;
+namespace FOS\ElasticaBundle\Tests\Manager;
 
-use FOQ\ElasticaBundle\Manager\RepositoryManager;
+use FOS\ElasticaBundle\Manager\RepositoryManager;
 
 class CustomRepository{}
 
@@ -16,7 +16,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
 
     public function testThatGetRepositoryReturnsDefaultRepository()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -24,17 +24,17 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($readerMock);
         $manager->addEntity($entityName, $finderMock);
         $repository = $manager->getRepository($entityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
+        $this->assertInstanceOf('FOS\ElasticaBundle\Repository', $repository);
     }
 
     public function testThatGetRepositoryReturnsCustomRepository()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -42,12 +42,12 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($readerMock);
-        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\Manager\CustomRepository');
+        $manager->addEntity($entityName, $finderMock, 'FOS\ElasticaBundle\Tests\Manager\CustomRepository');
         $repository = $manager->getRepository($entityName);
-        $this->assertInstanceOf('FOQ\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
+        $this->assertInstanceOf('FOS\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
     }
 
     /**
@@ -55,7 +55,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
      */
     public function testThatGetRepositoryThrowsExceptionIfEntityNotConfigured()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -63,7 +63,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($readerMock);
         $manager->addEntity($entityName, $finderMock);
@@ -75,7 +75,7 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
      */
     public function testThatGetRepositoryThrowsExceptionIfCustomRepositoryNotFound()
     {
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -83,10 +83,10 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
+        $entityName = 'FOS\ElasticaBundle\Tests\Manager\Entity';
 
         $manager = new RepositoryManager($readerMock);
-        $manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\MissingRepository');
+        $manager->addEntity($entityName, $finderMock, 'FOS\ElasticaBundle\Tests\MissingRepository');
         $manager->getRepository('Missing Entity');
     }
 
diff --git a/Tests/Persister/ObjectPersisterTest.php b/Tests/Persister/ObjectPersisterTest.php
index 335ac4e..ea5dfdf 100644
--- a/Tests/Persister/ObjectPersisterTest.php
+++ b/Tests/Persister/ObjectPersisterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\ObjectPersister;
+namespace FOS\ElasticaBundle\Tests\ObjectPersister;
 
-use FOQ\ElasticaBundle\Persister\ObjectPersister;
-use FOQ\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer;
+use FOS\ElasticaBundle\Persister\ObjectPersister;
+use FOS\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer;
 
 class POPO
 {
diff --git a/Tests/Provider/ProviderRegistryTest.php b/Tests/Provider/ProviderRegistryTest.php
index 8582aab..7a194e1 100644
--- a/Tests/Provider/ProviderRegistryTest.php
+++ b/Tests/Provider/ProviderRegistryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Provider;
+namespace FOS\ElasticaBundle\Tests\Provider;
 
-use FOQ\ElasticaBundle\Provider\ProviderRegistry;
+use FOS\ElasticaBundle\Provider\ProviderRegistry;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ProviderRegistryTest extends \PHPUnit_Framework_TestCase
diff --git a/Tests/RepositoryTest.php b/Tests/RepositoryTest.php
index 6d51f29..dfcd118 100644
--- a/Tests/RepositoryTest.php
+++ b/Tests/RepositoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests;
+namespace FOS\ElasticaBundle\Tests;
 
-use FOQ\ElasticaBundle\Repository;
+use FOS\ElasticaBundle\Repository;
 
 /**
  * @author Richard Miller <info@limethinking.co.uk>
@@ -14,7 +14,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
     {
         $testQuery = 'Test Query';
 
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
         $finderMock->expects($this->once())
@@ -30,7 +30,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $testQuery = 'Test Query';
         $testLimit = 20;
 
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
         $finderMock->expects($this->once())
@@ -45,7 +45,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
     {
         $testQuery = 'Test Query';
 
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
         $finderMock->expects($this->once())
@@ -61,7 +61,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
         $testQuery = 'Test Query';
         $testLimit = 20;
 
-        $finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
+        $finderMock = $this->getMockBuilder('FOS\ElasticaBundle\Finder\TransformedFinder')
             ->disableOriginalConstructor()
             ->getMock();
         $finderMock->expects($this->once())
diff --git a/Tests/ResetterTest.php b/Tests/ResetterTest.php
index 754310c..3b54883 100644
--- a/Tests/ResetterTest.php
+++ b/Tests/ResetterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Resetter;
+namespace FOS\ElasticaBundle\Tests\Resetter;
 
-use FOQ\ElasticaBundle\Resetter;
+use FOS\ElasticaBundle\Resetter;
 
 class ResetterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/Transformer/ElasticaToModelTransformerCollectionTest.php b/Tests/Transformer/ElasticaToModelTransformerCollectionTest.php
index 05ddaaa..2660f07 100644
--- a/Tests/Transformer/ElasticaToModelTransformerCollectionTest.php
+++ b/Tests/Transformer/ElasticaToModelTransformerCollectionTest.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Transformer;
+namespace FOS\ElasticaBundle\Tests\Transformer;
 
-use FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection;
+use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection;
 
 class ElasticaToModelTransformerCollectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection
+     * @var \FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection
      */
     protected $collection;
     protected $transformers = array();
 
     protected function collectionSetup()
     {
-        $transformer1 = $this->getMock('FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface');
+        $transformer1 = $this->getMock('FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface');
         $transformer1->expects($this->any())
             ->method('getObjectClass')
-            ->will($this->returnValue('FOQ\ElasticaBundle\Tests\Transformer\POPO'));
+            ->will($this->returnValue('FOS\ElasticaBundle\Tests\Transformer\POPO'));
 
         $transformer1->expects($this->any())
             ->method('getIdentifierField')
             ->will($this->returnValue('id'));
 
-        $transformer2 = $this->getMock('FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface');
+        $transformer2 = $this->getMock('FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface');
         $transformer2->expects($this->any())
             ->method('getObjectClass')
-            ->will($this->returnValue('FOQ\ElasticaBundle\Tests\Transformer\POPO2'));
+            ->will($this->returnValue('FOS\ElasticaBundle\Tests\Transformer\POPO2'));
 
         $transformer2->expects($this->any())
             ->method('getIdentifierField')
@@ -44,8 +44,8 @@ class ElasticaToModelTransformerCollectionTest extends \PHPUnit_Framework_TestCa
 
         $objectClasses = $this->collection->getObjectClass();
         $this->assertEquals(array(
-            'type1' => 'FOQ\ElasticaBundle\Tests\Transformer\POPO',
-            'type2' => 'FOQ\ElasticaBundle\Tests\Transformer\POPO2'
+            'type1' => 'FOS\ElasticaBundle\Tests\Transformer\POPO',
+            'type2' => 'FOS\ElasticaBundle\Tests\Transformer\POPO2'
         ), $objectClasses);
     }
 
diff --git a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php
index fe979e7..cb6c99e 100644
--- a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php
+++ b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Transformer\ModelToElasticaAutoTransformer;
+namespace FOS\ElasticaBundle\Tests\Transformer\ModelToElasticaAutoTransformer;
 
-use FOQ\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer;
+use FOS\ElasticaBundle\Transformer\ModelToElasticaAutoTransformer;
 
 class POPO
 {
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index bb67271..cf5b551 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -7,7 +7,7 @@ if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {
 }
 
 spl_autoload_register(function($class) {
-    if (0 === strpos($class, 'FOQ\\ElasticaBundle\\')) {
+    if (0 === strpos($class, 'FOS\\ElasticaBundle\\')) {
         $path = __DIR__.'/../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
         if (!stream_resolve_include_path($path)) {
             return false;
diff --git a/Transformer/ElasticaToModelTransformerCollection.php b/Transformer/ElasticaToModelTransformerCollection.php
index 539f03d..42131b2 100644
--- a/Transformer/ElasticaToModelTransformerCollection.php
+++ b/Transformer/ElasticaToModelTransformerCollection.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOS\ElasticaBundle\Transformer;
 
-use FOQ\ElasticaBundle\HybridResult;
+use FOS\ElasticaBundle\HybridResult;
 use Symfony\Component\Form\Util\PropertyPath;
 
 /**
diff --git a/Transformer/ElasticaToModelTransformerInterface.php b/Transformer/ElasticaToModelTransformerInterface.php
index 971bdfe..4399dc8 100644
--- a/Transformer/ElasticaToModelTransformerInterface.php
+++ b/Transformer/ElasticaToModelTransformerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOS\ElasticaBundle\Transformer;
 
 /**
  * Maps Elastica documents with model objects
diff --git a/Transformer/HighlightableModelInterface.php b/Transformer/HighlightableModelInterface.php
index fb7c1fd..c07f829 100644
--- a/Transformer/HighlightableModelInterface.php
+++ b/Transformer/HighlightableModelInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOS\ElasticaBundle\Transformer;
 
 /**
  * Maps Elastica documents with model objects
diff --git a/Transformer/ModelToElasticaAutoTransformer.php b/Transformer/ModelToElasticaAutoTransformer.php
index ab0f339..e212de0 100644
--- a/Transformer/ModelToElasticaAutoTransformer.php
+++ b/Transformer/ModelToElasticaAutoTransformer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOS\ElasticaBundle\Transformer;
 
 use Symfony\Component\Form\Util\PropertyPath;
 
diff --git a/Transformer/ModelToElasticaTransformerInterface.php b/Transformer/ModelToElasticaTransformerInterface.php
index 449078c..e92c228 100644
--- a/Transformer/ModelToElasticaTransformerInterface.php
+++ b/Transformer/ModelToElasticaTransformerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Transformer;
+namespace FOS\ElasticaBundle\Transformer;
 
 /**
  * Maps Elastica documents with model objects
diff --git a/composer.json b/composer.json
index 38a5b2a..4c63fd2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "exercise/elastica-bundle",
+    "name": "friendsofsymfony/elastica-bundle",
     "type": "symfony-bundle",
     "description": "Elasticsearch PHP integration for your Symfony2 project using Elastica",
     "keywords": ["doctrine2", "elastica", "elasticsearch", "mongodb", "propel", "search"],
-    "homepage": "https://github.com/Exercise/FOQElasticaBundle",
+    "homepage": "https://github.com/FriendsOfSymfony/FOSElasticaBundle",
     "license": "MIT",
     "authors": [
         { "name": "Thibault Duplessis", "email": "thibault.duplessis@gmail.com" },
@@ -28,7 +28,7 @@
         "propel/propel1": "1.6.*"
     },
     "autoload": {
-        "psr-0": { "FOQ\\ElasticaBundle": "" }
+        "psr-0": { "FOS\\ElasticaBundle": "" }
     },
-    "target-dir": "FOQ/ElasticaBundle"
+    "target-dir": "FOS/ElasticaBundle"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4ed054c..005cfd8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
     <testsuites>
-        <testsuite name="FOQElasticaBundle Test Suite">
+        <testsuite name="FOSElasticaBundle Test Suite">
             <directory>./Tests</directory>
         </testsuite>
     </testsuites>