diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 0e4d1e5..1d75024 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skuola\SeoBundle\DependencyInjection;
+namespace OpenSkuola\SeoBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/DependencyInjection/SkuolaSeoExtension.php b/DependencyInjection/SkuolaSeoExtension.php
index 5b3435a..c03ac45 100644
--- a/DependencyInjection/SkuolaSeoExtension.php
+++ b/DependencyInjection/SkuolaSeoExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skuola\SeoBundle\DependencyInjection;
+namespace OpenSkuola\SeoBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
diff --git a/Extension/Twig/PaginationMetaExtension.php b/Extension/Twig/PaginationMetaExtension.php
index d17a248..828c967 100644
--- a/Extension/Twig/PaginationMetaExtension.php
+++ b/Extension/Twig/PaginationMetaExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skuola\SeoBundle\Extension\Twig;
+namespace OpenSkuola\SeoBundle\Extension\Twig;
 
 use Knp\Bundle\PaginatorBundle\Pagination\SlidingPagination;
 use Symfony\Component\Routing\Generator\UrlGenerator;
diff --git a/README.md b/README.md
index 3e95d8b..6c62f5a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ public function registerBundles()
 {
     return array(
         // ...
-        new Skuola\SeoBundle\SkuolaSeoBundle()
+        new OpenSkuola\SeoBundle\SkuolaSeoBundle()
     );
 }
 ```
diff --git a/Resources/config/parameters.yml b/Resources/config/parameters.yml
index 9ed0137..582aadd 100644
--- a/Resources/config/parameters.yml
+++ b/Resources/config/parameters.yml
@@ -1,2 +1,2 @@
 parameters:
-    skuola_seo.twig_pagination_meta.extension.class: Skuola\SeoBundle\Extension\Twig\PaginationMetaExtension
\ No newline at end of file
+    skuola_seo.twig_pagination_meta.extension.class: OpenSkuola\SeoBundle\Extension\Twig\PaginationMetaExtension
\ No newline at end of file
diff --git a/SkuolaSeoBundle.php b/SkuolaSeoBundle.php
index c3a5be8..ed3f9c0 100644
--- a/SkuolaSeoBundle.php
+++ b/SkuolaSeoBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skuola\SeoBundle;
+namespace OpenSkuola\SeoBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/Tests/Unit/Extension/Twig/PaginationMetaExtensionTest.php b/Tests/Unit/Extension/Twig/PaginationMetaExtensionTest.php
index a0ef285..703b836 100644
--- a/Tests/Unit/Extension/Twig/PaginationMetaExtensionTest.php
+++ b/Tests/Unit/Extension/Twig/PaginationMetaExtensionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Skuola\SeoBundle\Tests\Extension;
+namespace OpenSkuola\SeoBundle\Tests\Extension;
 
-use Skuola\SeoBundle\Extension\Twig\PaginationMetaExtension;
+use OpenSkuola\SeoBundle\Extension\Twig\PaginationMetaExtension;
 use Symfony\Component\Routing\Router;
 use Knp\Bundle\PaginatorBundle\Pagination\SlidingPagination;
 use Mockery as m;
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index 6e31422..133eea8 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -10,4 +10,4 @@
 EOT
     );
 }
-$loader->add('Skuola\SeoBundle\Tests', __DIR__);
\ No newline at end of file
+$loader->add('OpenSkuola\SeoBundle\Tests', __DIR__);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index db5e674..6096dd3 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,8 @@
     "mockery/mockery": "dev-master"
   },
   "autoload": {
-    "psr-0": { "Skuola\\SeoBundle": "" }
+    "psr-4": { "OpenSkuola\\SeoBundle\\": "" }
   },
-  "target-dir": "Skuola/SeoBundle",
   "extra": {
     "branch-alias": {
       "dev-master": "1.0-dev"