diff --git a/behat.yml-dist b/behat.yml-dist
index c3d21285..79f85df0 100644
--- a/behat.yml-dist
+++ b/behat.yml-dist
@@ -20,4 +20,4 @@ default:
             files_path: 'fixtures/files'
             goutte: ~
             selenium2: ~
-        Sanpi\Behatch\Extension: ~
+        Behatch\Extension: ~
diff --git a/bin/main b/bin/main
index af876420..7eed999e 100644
--- a/bin/main
+++ b/bin/main
@@ -10,10 +10,10 @@
 */
 
 spl_autoload_register(function($class) {
-    if (false !== strpos($class, 'Sanpi\\Behatch')) {
+    if (false !== strpos($class, 'Behatch')) {
         require_once(__DIR__.'/../src/'.str_replace('\\', '/', $class).'.php');
         return true;
     }
 }, true, false);
 
-return new Sanpi\Behatch\Extension;
+return new Behatch\Extension;
diff --git a/composer.json b/composer.json
index bf00fbaa..3186039a 100644
--- a/composer.json
+++ b/composer.json
@@ -22,15 +22,11 @@
 
     "autoload": {
         "psr-4": {
-            "Sanpi\\Behatch\\": "src/"
+            "Behatch\\": "src/"
         }
     },
 
     "config": {
         "bin-dir": "bin/"
-    },
-
-    "replace": {
-        "sanpi/Behatch-skeleton": "self.version"
     }
 }
diff --git a/doc/index.rst b/doc/index.rst
index be4639b1..6029b461 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -75,7 +75,7 @@ Project dependancy
     default:
         # ...
         extensions:
-            Sanpi\Behatch\Extension: ~
+            Behatch\Extension: ~
 
 Project boostraping
 *******************
diff --git a/src/Context/BaseContext.php b/src/Context/BaseContext.php
index fba81b72..ca379e2a 100644
--- a/src/Context/BaseContext.php
+++ b/src/Context/BaseContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Behat\Context\TranslatableContext;
 use Behat\MinkExtension\Context\RawMinkContext;
diff --git a/src/Context/BrowserContext.php b/src/Context/BrowserContext.php
index 7de43cb3..f6a61676 100644
--- a/src/Context/BrowserContext.php
+++ b/src/Context/BrowserContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Behat\Context\Step;
 use Behat\Gherkin\Node\TableNode;
diff --git a/src/Context/ContextClass/ClassResolver.php b/src/Context/ContextClass/ClassResolver.php
index 09068470..12b7951c 100644
--- a/src/Context/ContextClass/ClassResolver.php
+++ b/src/Context/ContextClass/ClassResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context\ContextClass;
+namespace Behatch\Context\ContextClass;
 
 use Behat\Behat\Context\ContextClass\ClassResolver as BaseClassResolver;
 
@@ -16,6 +16,6 @@ public function resolveClass($contextClass)
         list(, $className) = explode(':', $contextClass);
 
         $className = ucfirst($className);
-        return "\\Sanpi\\Behatch\\Context\\{$className}Context";
+        return "\\Behatch\\Context\\{$className}Context";
     }
 }
diff --git a/src/Context/DebugContext.php b/src/Context/DebugContext.php
index fdfe8e40..a60898ec 100644
--- a/src/Context/DebugContext.php
+++ b/src/Context/DebugContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Behat\Event\StepEvent;
 
diff --git a/src/Context/JsonContext.php b/src/Context/JsonContext.php
index e0816919..0698a5fd 100644
--- a/src/Context/JsonContext.php
+++ b/src/Context/JsonContext.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Gherkin\Node\PyStringNode;
 
-use Sanpi\Behatch\Json\Json;
-use Sanpi\Behatch\Json\JsonSchema;
-use Sanpi\Behatch\Json\JsonInspector;
-use Sanpi\Behatch\HttpCall\HttpCallResultAware;
-use Sanpi\Behatch\HttpCall\HttpCallResultPool;
+use Behatch\Json\Json;
+use Behatch\Json\JsonSchema;
+use Behatch\Json\JsonInspector;
+use Behatch\HttpCall\HttpCallResultAware;
+use Behatch\HttpCall\HttpCallResultPool;
 
 class JsonContext extends BaseContext
 {
diff --git a/src/Context/RestContext.php b/src/Context/RestContext.php
index d70c1e7e..d525942e 100644
--- a/src/Context/RestContext.php
+++ b/src/Context/RestContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Behat\Context\Step;
 use Behat\Gherkin\Node\TableNode;
diff --git a/src/Context/SystemContext.php b/src/Context/SystemContext.php
index 8d21508a..ab8ed27c 100644
--- a/src/Context/SystemContext.php
+++ b/src/Context/SystemContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Behat\Context\Step;
 use Behat\Gherkin\Node\PyStringNode;
diff --git a/src/Context/TableContext.php b/src/Context/TableContext.php
index c8479cdc..23c66364 100644
--- a/src/Context/TableContext.php
+++ b/src/Context/TableContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Gherkin\Node\TableNode;
 
diff --git a/src/Context/XmlContext.php b/src/Context/XmlContext.php
index e67d6726..df823279 100644
--- a/src/Context/XmlContext.php
+++ b/src/Context/XmlContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Context;
+namespace Behatch\Context;
 
 use Behat\Gherkin\Node\PyStringNode;
 
diff --git a/src/Extension.php b/src/Extension.php
index 0a923bd0..0b2112d2 100644
--- a/src/Extension.php
+++ b/src/Extension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch;
+namespace Behatch;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -42,7 +42,7 @@ public function configure(ArrayNodeDefinition $builder)
 
     private function loadClassResolver(ContainerBuilder $container)
     {
-        $definition = new Definition('Sanpi\Behatch\Context\ContextClass\ClassResolver');
+        $definition = new Definition('Behatch\Context\ContextClass\ClassResolver');
         $definition->addTag(ContextExtension::CLASS_RESOLVER_TAG);
         $container->setDefinition('behatch.class_resolver', $definition);
     }
diff --git a/src/HttpCall/ContextSupportedVoter.php b/src/HttpCall/ContextSupportedVoter.php
index cdeb6997..34b2e61c 100644
--- a/src/HttpCall/ContextSupportedVoter.php
+++ b/src/HttpCall/ContextSupportedVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 interface ContextSupportedVoter
 {
diff --git a/src/HttpCall/ContextSupportedVoters.php b/src/HttpCall/ContextSupportedVoters.php
index c332e050..6846214f 100644
--- a/src/HttpCall/ContextSupportedVoters.php
+++ b/src/HttpCall/ContextSupportedVoters.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 class ContextSupportedVoters implements ContextSupportedVoter
 {
diff --git a/src/HttpCall/FilterableHttpCallResult.php b/src/HttpCall/FilterableHttpCallResult.php
index 640b72b3..88d5c044 100644
--- a/src/HttpCall/FilterableHttpCallResult.php
+++ b/src/HttpCall/FilterableHttpCallResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 interface FilterableHttpCallResult
 {
diff --git a/src/HttpCall/HttpCallListener.php b/src/HttpCall/HttpCallListener.php
index 90a47318..83323e85 100644
--- a/src/HttpCall/HttpCallListener.php
+++ b/src/HttpCall/HttpCallListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 use Behat\Behat\EventDispatcher\Event\StepTested;
 use Behat\Behat\EventDispatcher\Event\AfterStepTested;
diff --git a/src/HttpCall/HttpCallResult.php b/src/HttpCall/HttpCallResult.php
index e8444c22..32ba77d9 100644
--- a/src/HttpCall/HttpCallResult.php
+++ b/src/HttpCall/HttpCallResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 class HttpCallResult
 {
diff --git a/src/HttpCall/HttpCallResultPool.php b/src/HttpCall/HttpCallResultPool.php
index 9c6afdd0..309758e3 100644
--- a/src/HttpCall/HttpCallResultPool.php
+++ b/src/HttpCall/HttpCallResultPool.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 class HttpCallResultPool
 {
diff --git a/src/HttpCall/HttpCallResultPoolResolver.php b/src/HttpCall/HttpCallResultPoolResolver.php
index dfb7234a..777677b2 100644
--- a/src/HttpCall/HttpCallResultPoolResolver.php
+++ b/src/HttpCall/HttpCallResultPoolResolver.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 use Behat\Behat\Context\Environment\Handler\ContextEnvironmentHandler;
 use Behat\Behat\Context\Argument\ArgumentResolver;
 
-use Sanpi\Behatch\HttpCall\HttpCallResultPool;
+use Behatch\HttpCall\HttpCallResultPool;
 
 class HttpCallResultPoolResolver implements ArgumentResolver
 {
@@ -22,7 +22,7 @@ public function resolveArguments(\ReflectionClass $classReflection, array $argum
         if ($constructor !== null) {
             $parameters = $constructor->getParameters();
             foreach ($parameters as $parameter) {
-                if (null !== $parameter->getClass() && $parameter->getClass()->name === 'Sanpi\\Behatch\\HttpCall\\HttpCallResultPool') {
+                if (null !== $parameter->getClass() && $parameter->getClass()->name === 'Behatch\\HttpCall\\HttpCallResultPool') {
                     $arguments[$parameter->name] = $this->httpCallResultPool;
                 }
             }
diff --git a/src/HttpCall/RestContextVoter.php b/src/HttpCall/RestContextVoter.php
index 845339a8..01d47e8f 100644
--- a/src/HttpCall/RestContextVoter.php
+++ b/src/HttpCall/RestContextVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\HttpCall;
+namespace Behatch\HttpCall;
 
 class RestContextVoter implements ContextSupportedVoter, FilterableHttpCallResult
 {
diff --git a/src/Json/Json.php b/src/Json/Json.php
index 8f7e6294..227aa270 100644
--- a/src/Json/Json.php
+++ b/src/Json/Json.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Json;
+namespace Behatch\Json;
 
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
diff --git a/src/Json/JsonInspector.php b/src/Json/JsonInspector.php
index c6b5485e..3de5fecc 100644
--- a/src/Json/JsonInspector.php
+++ b/src/Json/JsonInspector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Json;
+namespace Behatch\Json;
 
 use JsonSchema\RefResolver;
 use JsonSchema\Validator;
diff --git a/src/Json/JsonSchema.php b/src/Json/JsonSchema.php
index 659ada01..955c1f36 100644
--- a/src/Json/JsonSchema.php
+++ b/src/Json/JsonSchema.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sanpi\Behatch\Json;
+namespace Behatch\Json;
 
 use JsonSchema\RefResolver;
 use JsonSchema\Validator;
diff --git a/src/Resources/services/http_call.yml b/src/Resources/services/http_call.yml
index 18c0009d..3268d36d 100644
--- a/src/Resources/services/http_call.yml
+++ b/src/Resources/services/http_call.yml
@@ -1,23 +1,23 @@
 services:
     behatch.http_call.listener:
-        class: Sanpi\Behatch\HttpCall\HttpCallListener
+        class: Behatch\HttpCall\HttpCallListener
         arguments: [@behatch.context_supported.voter, @behatch.http_call.result_pool, @mink]
         tags:
             - { name: event_dispatcher.subscriber, priority: 0 }
 
     behatch.http_call.result_pool:
-        class: Sanpi\Behatch\HttpCall\HttpCallResultPool
+        class: Behatch\HttpCall\HttpCallResultPool
 
     behatch.context_supported.voter:
-        class: Sanpi\Behatch\HttpCall\ContextSupportedVoters
+        class: Behatch\HttpCall\ContextSupportedVoters
 
     behatch.rest_context_supported.voter:
-        class: Sanpi\Behatch\HttpCall\RestContextVoter
+        class: Behatch\HttpCall\RestContextVoter
         tags:
             - { name: behatch.context_voter }
 
     behatch.http_call.argument_resolver:
-        class: Sanpi\Behatch\HttpCall\HttpCallResultPoolResolver
+        class: Behatch\HttpCall\HttpCallResultPoolResolver
         arguments: [@behatch.http_call.result_pool]
         tags:
             - { name: context.argument_resolver }
diff --git a/tests/units/Json/Json.php b/tests/units/Json/Json.php
index f330abfc..55650b49 100644
--- a/tests/units/Json/Json.php
+++ b/tests/units/Json/Json.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sanpi\Behatch\Tests\Units\Json;
+namespace Behatch\Tests\Units\Json;
 
-use \atoum;
-use Sanpi\Behatch\Json\Json as TestedClass;
+use atoum;
+use Behatch\Json\Json as TestedClass;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
 class Json extends atoum
diff --git a/tests/units/Json/JsonInspector.php b/tests/units/Json/JsonInspector.php
index 717962e1..da12a6db 100644
--- a/tests/units/Json/JsonInspector.php
+++ b/tests/units/Json/JsonInspector.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sanpi\Behatch\Tests\Units\Json;
+namespace Behatch\Tests\Units\Json;
 
 use \atoum;
 use JsonSchema\RefResolver;
 use JsonSchema\Validator;
 use JsonSchema\Uri\UriRetriever;
-use Sanpi\Behatch\Json\JsonInspector as TestedClass;
+use Behatch\Json\JsonInspector as TestedClass;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
 class JsonInspector extends atoum
@@ -15,7 +15,7 @@ public function test_should_read_json()
     {
         $this
             ->given(
-                $json = new \mock\Sanpi\Behatch\Json\Json('{}'),
+                $json = new \mock\Behatch\Json\Json('{}'),
                 $json->getMockController()->read = 'foobar'
             )
             ->and(
@@ -38,7 +38,7 @@ public function test_should_fail_if_json_reading_fail()
     {
         $this
             ->given(
-                $json = new \mock\Sanpi\Behatch\Json\Json('{}'),
+                $json = new \mock\Behatch\Json\Json('{}'),
                 $json->getMockController()->read->throw = new \Exception()
             )
             ->and(
@@ -55,7 +55,7 @@ public function test_should_convert_expression_if_javascript_mode()
     {
         $this
             ->given(
-                $json = new \mock\Sanpi\Behatch\Json\Json('{}'),
+                $json = new \mock\Behatch\Json\Json('{}'),
                 $json->getMockController()->read = 'foobar'
             )
             ->and(
@@ -78,7 +78,7 @@ public function test_should_no_convert_expression_if_no_javascript_mode()
     {
         $this
             ->given(
-                $json = new \mock\Sanpi\Behatch\Json\Json('{}'),
+                $json = new \mock\Behatch\Json\Json('{}'),
                 $json->getMockController()->read = 'foobar'
             )
             ->and(
@@ -101,8 +101,8 @@ public function test_should_valid_json_through_its_schema()
     {
         $this
             ->given(
-                $json = new \mock\Sanpi\Behatch\Json\Json('{}'),
-                $schema = new \mock\Sanpi\Behatch\Json\JsonSchema('{}'),
+                $json = new \mock\Behatch\Json\Json('{}'),
+                $schema = new \mock\Behatch\Json\JsonSchema('{}'),
                 $schema->getMockController()->resolve = $schema,
                 $schema->getMockController()->validate = 'foobar',
                 $inspector = new TestedClass('foo')
diff --git a/tests/units/Json/JsonSchema.php b/tests/units/Json/JsonSchema.php
index 02b97b18..a5870f58 100644
--- a/tests/units/Json/JsonSchema.php
+++ b/tests/units/Json/JsonSchema.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sanpi\Behatch\Tests\Units\Json;
+namespace Behatch\Tests\Units\Json;
 
-use \atoum;
-use Sanpi\Behatch\Json\JsonSchema as TestedClass;
+use atoum;
+use Behatch\Json\JsonSchema as TestedClass;
 
 class JsonSchema extends atoum
 {
@@ -51,7 +51,7 @@ public function test_should_validate_correct_json()
         $this
             ->given(
                 $schema = new TestedClass('{}'),
-                $json = new \Sanpi\Behatch\Json\Json('{}'),
+                $json = new \Behatch\Json\Json('{}'),
                 $validator = new \mock\JsonSchema\Validator,
                 $validator->getMockController()->check = true
             )
@@ -73,7 +73,7 @@ public function test_should_throw_exception_for_incorrect_json()
         $this
             ->given(
                 $schema = new TestedClass('{}'),
-                $json = new \Sanpi\Behatch\Json\Json('{}'),
+                $json = new \Behatch\Json\Json('{}'),
                 $validator = new \mock\JsonSchema\Validator,
                 $validator->getMockController()->check = false,
                 $validator->getMockController()->getErrors = array(