diff --git a/Annotation/ApiDoc.php b/Annotation/ApiDoc.php
index dd3973d..026d5ff 100644
--- a/Annotation/ApiDoc.php
+++ b/Annotation/ApiDoc.php
@@ -369,7 +369,7 @@ class ApiDoc
     }
 
     /**
-     * Sets the responsed data as processed by the parsers - same format as parameters
+     * Sets the response data as processed by the parsers - same format as parameters
      *
      * @param array $response
      */
diff --git a/Parser/JmsMetadataParser.php b/Parser/JmsMetadataParser.php
index 8af8432..483fc51 100644
--- a/Parser/JmsMetadataParser.php
+++ b/Parser/JmsMetadataParser.php
@@ -152,7 +152,7 @@ class JmsMetadataParser implements ParserInterface
      * Figure out a normalized data type (for documentation), and get a
      * nested class name, if available.
      *
-     * @param  PropertyMetadata $type
+     * @param  PropertyMetadata $item
      * @return array
      */
     protected function processDataType(PropertyMetadata $item)
diff --git a/Tests/Extractor/ApiDocExtractorTest.php b/Tests/Extractor/ApiDocExtractorTest.php
index e05a251..3536ce7 100644
--- a/Tests/Extractor/ApiDocExtractorTest.php
+++ b/Tests/Extractor/ApiDocExtractorTest.php
@@ -90,7 +90,7 @@ class ApiDocExtractorTest extends WebTestCase
         $this->assertTrue(is_array($array['filters']));
         $this->assertNull($annotation->getInput());
 
-        $annotation2 = $extractor->get('nemlio.test.controller:indexAction', 'test_service_route_1');
+        $annotation2 = $extractor->get('nelmio.test.controller:indexAction', 'test_service_route_1');
         $annotation2->getRoute()
             ->setDefault('_controller', $annotation->getRoute()->getDefault('_controller'))
             ->compile(); // compile as we changed a default value
@@ -118,7 +118,7 @@ class ApiDocExtractorTest extends WebTestCase
 
         $this->assertNull($data);
 
-        $data = $extractor->get('nemlio.test.controller:indexAction', 'invalid_route');
+        $data = $extractor->get('nelmio.test.controller:indexAction', 'invalid_route');
 
         $this->assertNull($data);
     }
@@ -131,7 +131,7 @@ class ApiDocExtractorTest extends WebTestCase
 
         $this->assertNull($data);
 
-        $data = $extractor->get('nemlio.test.controller', 'test_service_route_1');
+        $data = $extractor->get('nelmio.test.controller', 'test_service_route_1');
 
         $this->assertNull($data);
     }
@@ -144,7 +144,7 @@ class ApiDocExtractorTest extends WebTestCase
 
         $this->assertNull($data);
 
-        $data = $extractor->get('nemlio.test.controller:anotherAction', 'test_service_route_1');
+        $data = $extractor->get('nelmio.test.controller:anotherAction', 'test_service_route_1');
 
         $this->assertNull($data);
     }
diff --git a/Tests/Fixtures/app/config/default.yml b/Tests/Fixtures/app/config/default.yml
index c7edc26..d94b736 100644
--- a/Tests/Fixtures/app/config/default.yml
+++ b/Tests/Fixtures/app/config/default.yml
@@ -18,7 +18,7 @@ twig:
     strict_variables: %kernel.debug%
 
 services:
-    nemlio.test.controller:
+    nelmio.test.controller:
         class: Nelmio\ApiDocBundle\Tests\Fixtures\Controller\TestServiceController
     nelmio.test.type:
         class: Nelmio\ApiDocBundle\Tests\Fixtures\Form\DependencyType
diff --git a/Tests/Fixtures/app/config/routing.yml b/Tests/Fixtures/app/config/routing.yml
index 370ae0d..fdc9e97 100644
--- a/Tests/Fixtures/app/config/routing.yml
+++ b/Tests/Fixtures/app/config/routing.yml
@@ -71,24 +71,24 @@ test_route_13:
 
 test_service_route_1:
     pattern:  /tests.{_format}
-    defaults: { _controller: nemlio.test.controller:indexAction, _format: json }
+    defaults: { _controller: nelmio.test.controller:indexAction, _format: json }
     requirements:
         _method: GET
 
 test_service_route_2:
     pattern:  /tests.{_format}
     host:     api.test.dev
-    defaults: { _controller: nemlio.test.controller:postTestAction, _format: json }
+    defaults: { _controller: nelmio.test.controller:postTestAction, _format: json }
     requirements:
         _method: POST
 
 test_service_route_3:
     pattern:  /another
-    defaults: { _controller: nemlio.test.controller:anotherAction }
+    defaults: { _controller: nelmio.test.controller:anotherAction }
 
 test_service_route_4:
     pattern:  /any
-    defaults: { _controller: nemlio.test.controller:anyAction, _format: json }
+    defaults: { _controller: nelmio.test.controller:anyAction, _format: json }
 
 NelmioApiDocBundle:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"