diff --git a/Annotation/ApiDoc.php b/Annotation/ApiDoc.php
index 3fd9018..2176332 100644
--- a/Annotation/ApiDoc.php
+++ b/Annotation/ApiDoc.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Annotation;
+namespace Nelmio\ApiDocBundle\Annotation;
 
 /**
  * @Annotation
diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
index c520438..e49925d 100644
--- a/Command/DumpCommand.php
+++ b/Command/DumpCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Command;
+namespace Nelmio\ApiDocBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/Controller/ApiDocController.php b/Controller/ApiDocController.php
index 70533ab..ac0e43e 100644
--- a/Controller/ApiDocController.php
+++ b/Controller/ApiDocController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Controller;
+namespace Nelmio\ApiDocBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/DependencyInjection/NelmioApiExtension.php b/DependencyInjection/NelmioApiExtension.php
index 7fb67c1..1f2da18 100644
--- a/DependencyInjection/NelmioApiExtension.php
+++ b/DependencyInjection/NelmioApiExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\DependencyInjection;
+namespace Nelmio\ApiDocBundle\DependencyInjection;
 
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
diff --git a/EventListener/RequestListener.php b/EventListener/RequestListener.php
index c936d40..e28cde8 100644
--- a/EventListener/RequestListener.php
+++ b/EventListener/RequestListener.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Nelmio\ApiBundle\EventListener;
+namespace Nelmio\ApiDocBundle\EventListener;
 
-use Nelmio\ApiBundle\Extractor\ApiDocExtractor;
-use Nelmio\ApiBundle\Formatter\FormatterInterface;
+use Nelmio\ApiDocBundle\Extractor\ApiDocExtractor;
+use Nelmio\ApiDocBundle\Formatter\FormatterInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -12,12 +12,12 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 class RequestListener
 {
     /**
-     * @var \Nelmio\ApiBundle\Extractor\ApiDocExtractor
+     * @var \Nelmio\ApiDocBundle\Extractor\ApiDocExtractor
      */
     protected $extractor;
 
     /**
-     * @var \Nelmio\ApiBundle\Formatter\FormatterInterface
+     * @var \Nelmio\ApiDocBundle\Formatter\FormatterInterface
      */
     protected $formatter;
 
diff --git a/Extractor/ApiDocExtractor.php b/Extractor/ApiDocExtractor.php
index 02b8371..0c4abb5 100644
--- a/Extractor/ApiDocExtractor.php
+++ b/Extractor/ApiDocExtractor.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Nelmio\ApiBundle\Extractor;
+namespace Nelmio\ApiDocBundle\Extractor;
 
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\Routing\RouterInterface;
 
 class ApiDocExtractor
 {
-    const ANNOTATION_CLASS = 'Nelmio\\ApiBundle\\Annotation\\ApiDoc';
+    const ANNOTATION_CLASS = 'Nelmio\\ApiDocBundle\\Annotation\\ApiDoc';
 
     /**
      * @var \ymfony\Component\Routing\RouterInterface
diff --git a/Formatter/AbstractFormatter.php b/Formatter/AbstractFormatter.php
index 4358860..5827774 100644
--- a/Formatter/AbstractFormatter.php
+++ b/Formatter/AbstractFormatter.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Nelmio\ApiBundle\Formatter;
+namespace Nelmio\ApiDocBundle\Formatter;
 
-use Nelmio\ApiBundle\Annotation\ApiDoc;
-use Nelmio\ApiBundle\Parser\FormTypeParser;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Nelmio\ApiDocBundle\Parser\FormTypeParser;
 use Symfony\Component\Routing\Route;
 
 abstract class AbstractFormatter implements FormatterInterface
 {
     /**
-     * @var \Nelmio\ApiBundle\Parser\FormTypeParser
+     * @var \Nelmio\ApiDocBundle\Parser\FormTypeParser
      */
     protected $parser;
 
diff --git a/Formatter/FormatterInterface.php b/Formatter/FormatterInterface.php
index f15ba09..ed56184 100644
--- a/Formatter/FormatterInterface.php
+++ b/Formatter/FormatterInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Nelmio\ApiBundle\Formatter;
+namespace Nelmio\ApiDocBundle\Formatter;
 
-use Nelmio\ApiBundle\Annotation\ApiDoc;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\Routing\Route;
 
 interface FormatterInterface
diff --git a/Formatter/HtmlFormatter.php b/Formatter/HtmlFormatter.php
index 820544d..48403cb 100644
--- a/Formatter/HtmlFormatter.php
+++ b/Formatter/HtmlFormatter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Nelmio\ApiBundle\Formatter;
+namespace Nelmio\ApiDocBundle\Formatter;
 
-use Nelmio\ApiBundle\Annotation\ApiDoc;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\Routing\Route;
 
 class HtmlFormatter extends AbstractFormatter
diff --git a/Formatter/MarkdownFormatter.php b/Formatter/MarkdownFormatter.php
index e32ac6e..baea65a 100644
--- a/Formatter/MarkdownFormatter.php
+++ b/Formatter/MarkdownFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Formatter;
+namespace Nelmio\ApiDocBundle\Formatter;
 
 class MarkdownFormatter extends AbstractFormatter
 {
diff --git a/Formatter/SimpleFormatter.php b/Formatter/SimpleFormatter.php
index 0f9901e..f9d901f 100644
--- a/Formatter/SimpleFormatter.php
+++ b/Formatter/SimpleFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Formatter;
+namespace Nelmio\ApiDocBundle\Formatter;
 
 class SimpleFormatter extends AbstractFormatter
 {
diff --git a/NelmioApiBundle.php b/NelmioApiBundle.php
index 1791149..b42aba2 100644
--- a/NelmioApiBundle.php
+++ b/NelmioApiBundle.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Nelmio\ApiBundle;
+namespace Nelmio\ApiDocBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class NelmioApiBundle extends Bundle
+class NelmioApiDocBundle extends Bundle
 {
 }
diff --git a/Parser/FormTypeParser.php b/Parser/FormTypeParser.php
index 3726642..7a534f7 100644
--- a/Parser/FormTypeParser.php
+++ b/Parser/FormTypeParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Nelmio\ApiBundle\Parser;
+namespace Nelmio\ApiDocBundle\Parser;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilder;
diff --git a/Resources/config/formatters.xml b/Resources/config/formatters.xml
index 0d86441..8774a28 100644
--- a/Resources/config/formatters.xml
+++ b/Resources/config/formatters.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="nelmio.api.parser.form_type_parser.class">Nelmio\ApiBundle\Parser\FormTypeParser</parameter>
-        <parameter key="nelmio.api.formatter.abstract_formatter.class">Nelmio\ApiBundle\Formatter\AbstractFormatter</parameter>
-        <parameter key="nelmio.api.formatter.markdown_formatter.class">Nelmio\ApiBundle\Formatter\MarkdownFormatter</parameter>
-        <parameter key="nelmio.api.formatter.simple_formatter.class">Nelmio\ApiBundle\Formatter\SimpleFormatter</parameter>
-        <parameter key="nelmio.api.formatter.html_formatter.class">Nelmio\ApiBundle\Formatter\HtmlFormatter</parameter>
+        <parameter key="nelmio.api.parser.form_type_parser.class">Nelmio\ApiDocBundle\Parser\FormTypeParser</parameter>
+        <parameter key="nelmio.api.formatter.abstract_formatter.class">Nelmio\ApiDocBundle\Formatter\AbstractFormatter</parameter>
+        <parameter key="nelmio.api.formatter.markdown_formatter.class">Nelmio\ApiDocBundle\Formatter\MarkdownFormatter</parameter>
+        <parameter key="nelmio.api.formatter.simple_formatter.class">Nelmio\ApiDocBundle\Formatter\SimpleFormatter</parameter>
+        <parameter key="nelmio.api.formatter.html_formatter.class">Nelmio\ApiDocBundle\Formatter\HtmlFormatter</parameter>
     </parameters>
 
     <services>
diff --git a/Resources/config/request_listener.xml b/Resources/config/request_listener.xml
index 2a9a6bb..08d6ac5 100644
--- a/Resources/config/request_listener.xml
+++ b/Resources/config/request_listener.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="nelmio.api.event_listener.request.class">Nelmio\ApiBundle\EventListener\RequestListener</parameter>
+        <parameter key="nelmio.api.event_listener.request.class">Nelmio\ApiDocBundle\EventListener\RequestListener</parameter>
     </parameters>
 
     <services>
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index a5ab609..349be50 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -1,5 +1,5 @@
 nelmio_api_api_doc_index:
     pattern:  /api/doc
-    defaults: { _controller: NelmioApiBundle:ApiDoc:index }
+    defaults: { _controller: NelmioApiDocBundle:ApiDoc:index }
     requirements:
         _method: GET
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 78c1147..728eac5 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="nelmio.api.extractor.api_doc_extractor.class">Nelmio\ApiBundle\Extractor\ApiDocExtractor</parameter>
+        <parameter key="nelmio.api.extractor.api_doc_extractor.class">Nelmio\ApiDocBundle\Extractor\ApiDocExtractor</parameter>
     </parameters>
 
     <services>