diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/CoversTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/CoversTagTest.php
index 51ebc0b..2cb2033 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/CoversTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/CoversTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_Tag_Covers
+ * Test class for \phpDocumentor\Reflection\DocBlock\Tag\CoversTag
  *
  * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
@@ -23,8 +23,8 @@ namespace phpDocumentor\Reflection\DocBlock\Tag;
 class CoversTagTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\Covers can create a link
-     * for the covers doc block
+     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\CoversTag can create
+     * a link for the covers doc block.
      *
      * @param string $type
      * @param string $content
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/ParamTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/ParamTagTest.php
index 9ee3086..814c699 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/ParamTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/ParamTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_Param.
+ * Test class for \phpDocumentor\Reflection\DocBlock\ParamTag.
  *
  * @author    Mike van Riel <mike.vanriel@naenius.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/ReturnTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/ReturnTagTest.php
index 2f6e8e9..b8794cd 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/ReturnTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/ReturnTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_ReturnTag.
+ * Test class for \phpDocumentor\Reflection\DocBlock\ReturnTag.
  *
  * @author    Mike van Riel <mike.vanriel@naenius.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/SeeTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/SeeTagTest.php
index 231a154..2f270ed 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/SeeTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/SeeTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_Tag_See
+ * Test class for \phpDocumentor\Reflection\DocBlock\Tag\SeeTag
  *
  * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/UsesTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/UsesTagTest.php
index b9e3f16..513f4d5 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/UsesTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/UsesTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_Tag_Uses
+ * Test class for \phpDocumentor\Reflection\DocBlock\Tag\UsesTag
  *
  * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Tag/VarTagTest.php b/tests/phpDocumentor/Reflection/DocBlock/Tag/VarTagTest.php
index 3565170..b759fa6 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Tag/VarTagTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Tag/VarTagTest.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock_Tag_Link
+ * Test class for \phpDocumentor\Reflection\DocBlock\Tag\VarTag
  *
  * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
  * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
@@ -23,8 +23,8 @@ namespace phpDocumentor\Reflection\DocBlock\Tag;
 class VarTagTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\VarTag can understand
-     * the @var doc block
+     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\VarTag can
+     * understand the @var doc block
      *
      * @param string $type
      * @param string $content
diff --git a/tests/phpDocumentor/Reflection/DocBlock/Type/CollectionTest.php b/tests/phpDocumentor/Reflection/DocBlock/Type/CollectionTest.php
index 23263a7..2c13337 100644
--- a/tests/phpDocumentor/Reflection/DocBlock/Type/CollectionTest.php
+++ b/tests/phpDocumentor/Reflection/DocBlock/Type/CollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * phpDocumentor Covers Tag Test
+ * phpDocumentor Collection Test
  * 
  * PHP version 5.3
  *
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Type;
 
 /**
- * Test class for phpDocumentor_Reflection_DocBlock
+ * Test class for \phpDocumentor\Reflection\DocBlock\Type\Collection
  * 
  * @covers phpDocumentor\Reflection\DocBlock\Type\Collection
  *