diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 08da2b3..cc4a7cd 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\DependencyInjection;
+namespace Knp\Bundle\MarkdownBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -16,7 +16,7 @@ class Configuration
     {
         $treeBuilder = new TreeBuilder();
 
-        $treeBuilder->root('knplabs_markdown', 'array')
+        $treeBuilder->root('knp_markdown', 'array')
             ->addDefaultsIfNotSet()
             ->children()
                 ->arrayNode('parser')
diff --git a/DependencyInjection/KnplabsMarkdownExtension.php b/DependencyInjection/KnpMarkdownExtension.php
similarity index 85%
rename from DependencyInjection/KnplabsMarkdownExtension.php
rename to DependencyInjection/KnpMarkdownExtension.php
index 115d47a..6cac0b0 100644
--- a/DependencyInjection/KnplabsMarkdownExtension.php
+++ b/DependencyInjection/KnpMarkdownExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\DependencyInjection;
+namespace Knp\Bundle\MarkdownBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -8,10 +8,10 @@ use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class KnplabsMarkdownExtension extends Extension
+class KnpMarkdownExtension extends Extension
 {
     /**
-     * Handles the knplabs_markdown configuration.
+     * Handles the knp_markdown configuration.
      *
      * @param array $configs The configurations being loaded
      * @param ContainerBuilder $container
diff --git a/Helper/MarkdownHelper.php b/Helper/MarkdownHelper.php
index f9de225..5a6fd22 100644
--- a/Helper/MarkdownHelper.php
+++ b/Helper/MarkdownHelper.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Helper;
+namespace Knp\Bundle\MarkdownBundle\Helper;
 
 use Symfony\Component\Templating\Helper\HelperInterface;
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
 
 class MarkdownHelper implements HelperInterface
 {
diff --git a/KnpMarkdownBundle.php b/KnpMarkdownBundle.php
new file mode 100644
index 0000000..98544e5
--- /dev/null
+++ b/KnpMarkdownBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Knp\Bundle\MarkdownBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle as BaseBundle;
+
+class KnpMarkdownBundle extends BaseBundle
+{
+}
diff --git a/KnplabsMarkdownBundle.php b/KnplabsMarkdownBundle.php
deleted file mode 100644
index 1045d49..0000000
--- a/KnplabsMarkdownBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Knplabs\Bundle\MarkdownBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle as BaseBundle;
-
-class KnplabsMarkdownBundle extends BaseBundle
-{
-}
diff --git a/MarkdownParserInterface.php b/MarkdownParserInterface.php
index 99df22e..6db18ad 100644
--- a/MarkdownParserInterface.php
+++ b/MarkdownParserInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle;
+namespace Knp\Bundle\MarkdownBundle;
 
 interface MarkdownParserInterface
 {
diff --git a/Parser/MarkdownParser.php b/Parser/MarkdownParser.php
index de98fde..1537603 100644
--- a/Parser/MarkdownParser.php
+++ b/Parser/MarkdownParser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Parser;
+namespace Knp\Bundle\MarkdownBundle\Parser;
 
-use Knplabs\Bundle\MarkdownBundle\MarkdownParserInterface;
+use Knp\Bundle\MarkdownBundle\MarkdownParserInterface;
 
 if(!class_exists('\MarkdownExtraParser')) {
     require_once(realpath(__DIR__.'/..').'/vendor/parser/MarkdownExtraParser.php');
diff --git a/Parser/Preset/Light.php b/Parser/Preset/Light.php
index 6a4b8f7..a1c8a13 100644
--- a/Parser/Preset/Light.php
+++ b/Parser/Preset/Light.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Parser\Preset;
+namespace Knp\Bundle\MarkdownBundle\Parser\Preset;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
 
 /**
  * Light featured Markdown Parser
diff --git a/Parser/Preset/Max.php b/Parser/Preset/Max.php
index ac760c8..24ed524 100644
--- a/Parser/Preset/Max.php
+++ b/Parser/Preset/Max.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Parser\Preset;
+namespace Knp\Bundle\MarkdownBundle\Parser\Preset;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
 
 /**
  * Full featured Markdown Parser
diff --git a/Parser/Preset/Medium.php b/Parser/Preset/Medium.php
index 9655976..8a72798 100644
--- a/Parser/Preset/Medium.php
+++ b/Parser/Preset/Medium.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Parser\Preset;
+namespace Knp\Bundle\MarkdownBundle\Parser\Preset;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
 
 /**
  * Medium featured Markdown Parser
diff --git a/Parser/Preset/Min.php b/Parser/Preset/Min.php
index e5ff6b6..5489a9d 100644
--- a/Parser/Preset/Min.php
+++ b/Parser/Preset/Min.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Parser\Preset;
+namespace Knp\Bundle\MarkdownBundle\Parser\Preset;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
 
 /**
  * Minimally featured Markdown Parser
diff --git a/README.markdown b/README.markdown
index 3a1405f..604d219 100644
--- a/README.markdown
+++ b/README.markdown
@@ -5,7 +5,7 @@ We added PHP5 sugar, feature selection, and unit tests.
 
 ## INSTALLATION
 
-Put MarkdownBundle in your `src/Bundle` dir.
+Put MarkdownBundle in a `vendor/bundles/Knp/Bundle/MarkdownBundle` dir.
 
 ## USAGE
 
@@ -21,10 +21,10 @@ If you have enabled the twig markdown filter, you can use the following in your
 
 ## Change the parser implementation
 
-Create a service implementing Knplabs\Bundle\MarkdownBundle\ParserInterface,
+Create a service implementing Knp\Bundle\MarkdownBundle\ParserInterface,
 then configure the bundle to use it:
 
-    knplabs_markdown:
+    knp_markdown:
           parser:
                   service: my.markdown.parser
 
@@ -40,4 +40,4 @@ For more details, see the implementations in Parser/Preset.
 
 ## TEST
 
-    phpunit -c myapp src/Bundle/MarkdownBundle
+    phpunit -c myapp vendor/bundles/Knp/Bundle/MarkdownBundle
diff --git a/Resources/config/helper.xml b/Resources/config/helper.xml
index 4682751..b910745 100644
--- a/Resources/config/helper.xml
+++ b/Resources/config/helper.xml
@@ -6,7 +6,7 @@
 
   <parameters>
 
-    <parameter key="templating.helper.markdown.class">Knplabs\Bundle\MarkdownBundle\Helper\MarkdownHelper</parameter>
+    <parameter key="templating.helper.markdown.class">Knp\Bundle\MarkdownBundle\Helper\MarkdownHelper</parameter>
 
   </parameters>
 
diff --git a/Resources/config/parser.xml b/Resources/config/parser.xml
index 94958a9..1f71c88 100644
--- a/Resources/config/parser.xml
+++ b/Resources/config/parser.xml
@@ -5,10 +5,10 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
   <services>
-      <service id="markdown.parser.min" class="Knplabs\Bundle\MarkdownBundle\Parser\Preset\Min" />
-      <service id="markdown.parser.light" class="Knplabs\Bundle\MarkdownBundle\Parser\Preset\Light" />
-      <service id="markdown.parser.medium" class="Knplabs\Bundle\MarkdownBundle\Parser\Preset\Medium" />
-      <service id="markdown.parser.max" class="Knplabs\Bundle\MarkdownBundle\Parser\Preset\Max" />
+      <service id="markdown.parser.min" class="Knp\Bundle\MarkdownBundle\Parser\Preset\Min" />
+      <service id="markdown.parser.light" class="Knp\Bundle\MarkdownBundle\Parser\Preset\Light" />
+      <service id="markdown.parser.medium" class="Knp\Bundle\MarkdownBundle\Parser\Preset\Medium" />
+      <service id="markdown.parser.max" class="Knp\Bundle\MarkdownBundle\Parser\Preset\Max" />
   </services>
 
 </container>
diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
index c958ad3..7605640 100644
--- a/Resources/config/twig.xml
+++ b/Resources/config/twig.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="twig.extension.exercise.twig" class="Knplabs\Bundle\MarkdownBundle\Twig\Extension\MarkdownTwigExtension" public="false">
+        <service id="twig.extension.exercise.twig" class="Knp\Bundle\MarkdownBundle\Twig\Extension\MarkdownTwigExtension" public="false">
             <argument type="service" id="templating.helper.markdown" />
             <tag name="twig.extension" />
         </service>
diff --git a/Tests/EscapingTest.php b/Tests/EscapingTest.php
index 9e578dd..d22ac5c 100644
--- a/Tests/EscapingTest.php
+++ b/Tests/EscapingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests;
+namespace Knp\Bundle\MarkdownBundle\Tests;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
 
 class EscapingTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/FeatureTest.php b/Tests/FeatureTest.php
index b168d79..69c1c41 100644
--- a/Tests/FeatureTest.php
+++ b/Tests/FeatureTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests;
+namespace Knp\Bundle\MarkdownBundle\Tests;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
 
 class FeatureTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/Performance/Base.php b/Tests/Performance/Base.php
index beee62c..0971bcd 100644
--- a/Tests/Performance/Base.php
+++ b/Tests/Performance/Base.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests\Performance;
+namespace Knp\Bundle\MarkdownBundle\Tests\Performance;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
 
 abstract class Base
 {
diff --git a/Tests/Performance/Light.php b/Tests/Performance/Light.php
index 4f446e4..4f87d07 100644
--- a/Tests/Performance/Light.php
+++ b/Tests/Performance/Light.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests\Performance;
+namespace Knp\Bundle\MarkdownBundle\Tests\Performance;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\Preset\Light as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\Preset\Light as Parser;
 
 /**
  * Run tests with light-featured Markdown Parser
diff --git a/Tests/Performance/Max.php b/Tests/Performance/Max.php
index 51a00fd..cdaf9fc 100644
--- a/Tests/Performance/Max.php
+++ b/Tests/Performance/Max.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests\Performance;
+namespace Knp\Bundle\MarkdownBundle\Tests\Performance;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\Preset\Max as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\Preset\Max as Parser;
 
 /**
  * Run tests with full-featured Markdown Parser
diff --git a/Tests/Performance/Medium.php b/Tests/Performance/Medium.php
index eab2de8..dbebd43 100644
--- a/Tests/Performance/Medium.php
+++ b/Tests/Performance/Medium.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests\Performance;
+namespace Knp\Bundle\MarkdownBundle\Tests\Performance;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\Preset\Medium as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\Preset\Medium as Parser;
 
 /**
  * Run tests with minimal-featured Markdown Parser
diff --git a/Tests/Performance/Min.php b/Tests/Performance/Min.php
index 29574a3..65ac92c 100644
--- a/Tests/Performance/Min.php
+++ b/Tests/Performance/Min.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests\Performance;
+namespace Knp\Bundle\MarkdownBundle\Tests\Performance;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\Preset\Min as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\Preset\Min as Parser;
 
 /**
  * Run tests with minimal-featured Markdown Parser
diff --git a/Tests/Performance/index.php b/Tests/Performance/index.php
index 5d7e595..9007385 100644
--- a/Tests/Performance/index.php
+++ b/Tests/Performance/index.php
@@ -3,6 +3,6 @@
 $name = 'Min';
 
 require_once __DIR__.'/'.$name.'.php';
-$class = 'Knplabs\\MarkdownBundle\\Tests\\Performance\\'.$name;
+$class = 'Knp\\MarkdownBundle\\Tests\\Performance\\'.$name;
 $test = new $class();
 print nl2br($test->run(10));
diff --git a/Tests/PresetTest.php b/Tests/PresetTest.php
index a3cddfa..20604ba 100644
--- a/Tests/PresetTest.php
+++ b/Tests/PresetTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Tests;
+namespace Knp\Bundle\MarkdownBundle\Tests;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
+use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser as Parser;
 
-use Knplabs\Bundle\MarkdownBundle\Parser\Preset as Preset;
+use Knp\Bundle\MarkdownBundle\Parser\Preset as Preset;
 
 class PresetTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index 49c2b1e..2e21993 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -3,5 +3,5 @@
 require_once $_SERVER['SYMFONY'].'/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
 $loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
-$loader->registerNamespace('Knplabs\\Bundle\\MarkdownBundle', __DIR__.'/../../../..');
+$loader->registerNamespace('Knp\\Bundle\\MarkdownBundle', __DIR__.'/../../../..');
 $loader->register();
diff --git a/Twig/Extension/MarkdownTwigExtension.php b/Twig/Extension/MarkdownTwigExtension.php
index 53976d2..51bd629 100644
--- a/Twig/Extension/MarkdownTwigExtension.php
+++ b/Twig/Extension/MarkdownTwigExtension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Knplabs\Bundle\MarkdownBundle\Twig\Extension;
+namespace Knp\Bundle\MarkdownBundle\Twig\Extension;
 
-use Knplabs\Bundle\MarkdownBundle\Helper\MarkdownHelper;
+use Knp\Bundle\MarkdownBundle\Helper\MarkdownHelper;
 
 class MarkdownTwigExtension extends \Twig_Extension
 {