diff --git a/composer.json b/composer.json
index a397b7c5..b4e2b5e3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "behat/silverstripe-extension",
+    "name": "silverstripe/behat-extension",
     "type": "behat-extension",
     "description": "SilverStripe framework extension for Behat",
     "keywords": ["framework", "web", "bdd", "silverstripe"],
@@ -7,8 +7,12 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Michał Ochman",
+            "name": "Michal Ochman",
             "email": "ochman.d.michal@gmail.com"
+        },
+        {
+            "name": "Ingo Schommer",
+            "email": "ingo@silverstripe.com"
         }
     ],
 
diff --git a/init.php b/init.php
index bf9f14d8..2dc3ff57 100644
--- a/init.php
+++ b/init.php
@@ -11,10 +11,10 @@
 
 spl_autoload_register(function($class)
 {
-    if (false !== strpos($class, 'Behat\\SilverStripeExtension')) {
+    if (false !== strpos($class, 'SilverStripe\\BehatExtension')) {
         require_once(__DIR__ . '/src/' . str_replace('\\', '/', $class) . '.php');
         return true;
     }
 }, true, false);
 
-return new Behat\SilverStripeExtension\Extension;
\ No newline at end of file
+return new SilverStripe\BehatExtension\Extension;
\ No newline at end of file
diff --git a/src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php b/src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php
similarity index 92%
rename from src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php
rename to src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php
index a66ee288..d6d7c273 100644
--- a/src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php
+++ b/src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Behat\SilverStripeExtension\Compiler;
+namespace SilverStripe\BehatExtension\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder,
     Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /*
- * This file is part of the Behat\SilverStripeExtension
+ * This file is part of the SilverStripe\BehatExtension
  *
  * (c) Michał Ochman <ochman.d.michal@gmail.com>
  *
diff --git a/src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
similarity index 95%
rename from src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php
rename to src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
index df226437..93ad1f8a 100644
--- a/src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php
+++ b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Behat\SilverStripeExtension\Context\Initializer;
+namespace SilverStripe\BehatExtension\Context\Initializer;
 
 use Behat\Behat\Context\Initializer\InitializerInterface,
 Behat\Behat\Context\ContextInterface;
 
-use Behat\SilverStripeExtension\Context\SilverStripeAwareContextInterface;
+use SilverStripe\BehatExtension\Context\SilverStripeAwareContextInterface;
 
 /*
  * This file is part of the Behat/SilverStripeExtension
diff --git a/src/Behat/SilverStripeExtension/Context/SilverStripeAwareContextInterface.php b/src/SilverStripe/BehatExtension/Context/SilverStripeAwareContextInterface.php
similarity index 94%
rename from src/Behat/SilverStripeExtension/Context/SilverStripeAwareContextInterface.php
rename to src/SilverStripe/BehatExtension/Context/SilverStripeAwareContextInterface.php
index 5da6bb2f..2490d88c 100644
--- a/src/Behat/SilverStripeExtension/Context/SilverStripeAwareContextInterface.php
+++ b/src/SilverStripe/BehatExtension/Context/SilverStripeAwareContextInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Behat\SilverStripeExtension\Context;
+namespace SilverStripe\BehatExtension\Context;
 
 /*
  * This file is part of the Behat/SilverStripeExtension
diff --git a/src/Behat/SilverStripeExtension/Extension.php b/src/SilverStripe/BehatExtension/Extension.php
similarity index 95%
rename from src/Behat/SilverStripeExtension/Extension.php
rename to src/SilverStripe/BehatExtension/Extension.php
index d15b12f5..fd11acae 100644
--- a/src/Behat/SilverStripeExtension/Extension.php
+++ b/src/SilverStripe/BehatExtension/Extension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Behat\SilverStripeExtension;
+namespace SilverStripe\BehatExtension;
 
 use Symfony\Component\Config\FileLocator,
     Symfony\Component\DependencyInjection\ContainerBuilder,
@@ -9,7 +9,7 @@
 use Behat\Behat\Extension\Extension as BaseExtension;
 
 /*
- * This file is part of the Behat\SilverStripeExtension
+ * This file is part of the SilverStripe\BehatExtension
  *
  * (c) Michał Ochman <ochman.d.michal@gmail.com>
  *
diff --git a/src/Behat/SilverStripeExtension/services/silverstripe.yml b/src/SilverStripe/BehatExtension/services/silverstripe.yml
similarity index 100%
rename from src/Behat/SilverStripeExtension/services/silverstripe.yml
rename to src/SilverStripe/BehatExtension/services/silverstripe.yml