diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index a12420b..958bc28 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\GravatarBundle\DependencyInjection;
+namespace Ornicar\GravatarBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/DependencyInjection/GravatarExtension.php b/DependencyInjection/OrnicarGravatarExtension.php
similarity index 88%
rename from DependencyInjection/GravatarExtension.php
rename to DependencyInjection/OrnicarGravatarExtension.php
index 2d6e7fa..c3ac951 100644
--- a/DependencyInjection/GravatarExtension.php
+++ b/DependencyInjection/OrnicarGravatarExtension.php
@@ -1,5 +1,5 @@
 <?php
-namespace Bundle\GravatarBundle\DependencyInjection;
+namespace Ornicar\GravatarBundle\DependencyInjection;
 
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -7,7 +7,7 @@
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 
-class GravatarExtension extends Extension
+class OrnicarGravatarExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {
diff --git a/GravatarApi.php b/GravatarApi.php
index 0b2b60c..4c2b76e 100644
--- a/GravatarApi.php
+++ b/GravatarApi.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\GravatarBundle;
+namespace Ornicar\GravatarBundle;
 
 /**
  * Simple wrapper to the gravatar API
diff --git a/GravatarBundle.php b/OrnicarGravatarBundle.php
similarity index 73%
rename from GravatarBundle.php
rename to OrnicarGravatarBundle.php
index 7667d71..555c67f 100644
--- a/GravatarBundle.php
+++ b/OrnicarGravatarBundle.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\GravatarBundle;
+namespace Ornicar\GravatarBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle as BaseBundle;
 
-class GravatarBundle extends BaseBundle
+class OrnicarGravatarBundle extends BaseBundle
 {
     public function getNamespace()
     {
diff --git a/README.markdown b/README.markdown
index 636b6d6..f4e88a4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,30 +3,38 @@ Installation
 
   1. Add this bundle to your project as Git submodules:
 
-          $ git submodule add git://github.com/ornicar/GravatarBundle.git src/Bundle/GravatarBundle
+          $ git submodule add git://github.com/ornicar/GravatarBundle.git vendor/bundles/Ornicar/GravatarBundle
 
+  2. Add the Ornicar namespace to your autoloader
 
-  2. Add this bundle to your application's kernel:
+          // app/autoload.php
+
+          $loader->registerNamespaces(array(
+             'Ornicar' => __DIR__.'/../vendor/bundles',
+             // your other namespaces
+          );
+
+  3. Add this bundle to your application's kernel:
 
           // application/ApplicationKernel.php
           public function registerBundles()
           {
               return array(
                   // ...
-                  new Bundle\GravatarBundle\GravatarBundle(),
+                  new Ornicar\GravatarBundle\OrnicarGravatarBundle(),
                   // ...
               );
           }
 
-  3. Configure the `gravatar` service, templating helper and Twig extension in your config:
+  4. Configure the `gravatar` service, templating helper and Twig extension in your config:
 
           # application/config/config.yml
-          gravatar: ~
+          ornicar_gravatar: ~
 
-  4. If you always have some default for your gravatars such as size, rating or default it can be configured in your config
+  5. If you always have some default for your gravatars such as size, rating or default it can be configured in your config
 
          # application/config/config.yml
-         gravatar:
+         ornicar_gravatar:
             rating: g
             size: 80
             default: mm
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 64e99e9..b7ad5b1 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -5,9 +5,9 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="templating.helper.gravatar.class">Bundle\GravatarBundle\Templating\Helper\GravatarHelper</parameter>
-        <parameter key="twig.extension.gravatar.class">Bundle\GravatarBundle\Twig\GravatarExtension</parameter>
-        <parameter key="gravatar.api.class">Bundle\GravatarBundle\GravatarApi</parameter>
+        <parameter key="templating.helper.gravatar.class">Ornicar\GravatarBundle\Templating\Helper\GravatarHelper</parameter>
+        <parameter key="twig.extension.gravatar.class">Ornicar\GravatarBundle\Twig\GravatarExtension</parameter>
+        <parameter key="gravatar.api.class">Ornicar\GravatarBundle\GravatarApi</parameter>
     </parameters>
 
     <services>
diff --git a/Templating/Helper/GravatarHelper.php b/Templating/Helper/GravatarHelper.php
index 8844657..0f3b1fd 100644
--- a/Templating/Helper/GravatarHelper.php
+++ b/Templating/Helper/GravatarHelper.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\GravatarBundle\Templating\Helper;
+namespace Ornicar\GravatarBundle\Templating\Helper;
 
 use Symfony\Component\DependencyInjection\ContainerInterface,
     Symfony\Component\Templating\Helper\Helper;
-use Bundle\GravatarBundle\GravatarApi;
+use Ornicar\GravatarBundle\GravatarApi;
 
 /**
  * Symfony 2 Helper for Gravatar. Uses Bundle\GravatarBundle\GravatarApi
@@ -15,7 +15,7 @@
 class GravatarHelper extends Helper implements GravatarHelperInterface
 {
     /**
-     * @var Bundle\GravatarBundle\GravatarApi $api
+     * @var Ornicar\GravatarBundle\GravatarApi $api
      */
     protected $api;
 
@@ -27,7 +27,7 @@ class GravatarHelper extends Helper implements GravatarHelperInterface
     /**
      * Constructor
      *
-     * @param Bundle\GravatarBundle\GravatarApi $api
+     * @param Ornicar\GravatarBundle\GravatarApi $api
      * @return void
      */
     public function __construct(GravatarApi $api, ContainerInterface $container = null)
diff --git a/Templating/Helper/GravatarHelperInterface.php b/Templating/Helper/GravatarHelperInterface.php
index 43626d6..6651b5e 100644
--- a/Templating/Helper/GravatarHelperInterface.php
+++ b/Templating/Helper/GravatarHelperInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\GravatarBundle\Templating\Helper;
+namespace Ornicar\GravatarBundle\Templating\Helper;
 
 interface GravatarHelperInterface
 {
diff --git a/Tests/GravatarApiTest.php b/Tests/GravatarApiTest.php
index 0dfd9ea..f19a5b6 100644
--- a/Tests/GravatarApiTest.php
+++ b/Tests/GravatarApiTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Bundle\GravatarBundle\Tests;
+namespace Ornicar\GravatarBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Bundle\GravatarBundle\GravatarApi;
+use Ornicar\GravatarBundle\GravatarApi;
 
 class GravatarApiTest extends TestCase
 {
diff --git a/Tests/Templating/Helper/GravatarHelperTest.php b/Tests/Templating/Helper/GravatarHelperTest.php
index de2b016..d0e3024 100644
--- a/Tests/Templating/Helper/GravatarHelperTest.php
+++ b/Tests/Templating/Helper/GravatarHelperTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\GravatarBundle\Tests\Templating\Helper;
+namespace Ornicar\GravatarBundle\Tests\Templating\Helper;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Bundle\GravatarBundle\GravatarApi;
-use Bundle\GravatarBundle\Templating\Helper\GravatarHelper;
+use Ornicar\GravatarBundle\GravatarApi;
+use Ornicar\GravatarBundle\Templating\Helper\GravatarHelper;
 
 class GravatarHelperTest extends TestCase
 {
diff --git a/Twig/GravatarExtension.php b/Twig/GravatarExtension.php
index 69c3330..e8be546 100644
--- a/Twig/GravatarExtension.php
+++ b/Twig/GravatarExtension.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Bundle\GravatarBundle\Twig;
+namespace Ornicar\GravatarBundle\Twig;
 
-use Bundle\GravatarBundle\Templating\Helper\GravatarHelper,
-    Bundle\GravatarBundle\Templating\Helper\GravatarHelperInterface;
+use Ornicar\GravatarBundle\Templating\Helper\GravatarHelper,
+    Ornicar\GravatarBundle\Templating\Helper\GravatarHelperInterface;
 
 /**
  * @author Thibault Duplessis