diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php
index d714240..a1ebc99 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php
@@ -32,7 +32,7 @@ class AuthorTag extends Tag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Name of the tag.
+     * @param string $type    Tag identifier for this tag (should be 'author').
      * @param string $content The contents of the given tag.
      */
     public function __construct($type, $content)
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php
index 7c798a9..04d64fc 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php
@@ -29,8 +29,8 @@ class LinkTag extends Tag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag type
-     * @param string $content Content of the tag
+     * @param string $type    Tag identifier for this tag (should be 'link').
+     * @param string $content The contents of the given tag.
      */
     public function __construct($type, $content)
     {
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php
index 3d45ec2..23f8dc1 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@method} in a Docblock.
+ * Reflection class for a @method in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -31,8 +31,8 @@ class MethodTag extends ParamTag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
-     * @param string $content Contents for this tag.
+     * @param string $type    Tag identifier for this tag (should be 'method').
+     * @param string $content The contents of the given tag.
      */
     public function __construct($type, $content)
     {
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php
index e222b9b..ade3c05 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php
@@ -15,7 +15,7 @@ namespace phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@param} tag in a Docblock.
+ * Reflection class for a @param tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -34,7 +34,7 @@ class ParamTag extends Tag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'param')
+     * @param string $type    Tag identifier for this tag (should be 'param').
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php
index 61d2fda..3340602 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@property} tag in a Docblock.
+ * Reflection class for a @property-read tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php
index b9ddaea..288ecff 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@property} tag in a Docblock.
+ * Reflection class for a @property tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php
index d6a38be..ec4e866 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@property} tag in a Docblock.
+ * Reflection class for a @property-write tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
index f893309..60d4d74 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@return} tag in a Docblock.
+ * Reflection class for a @return tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -27,7 +27,7 @@ class ReturnTag extends ParamTag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
+     * @param string $type    Tag identifier for this tag (should be 'return').
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php
index 7dd6797..6c89947 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php
@@ -15,7 +15,7 @@ namespace phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@see} tag in a Docblock.
+ * Reflection class for a @see tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -29,7 +29,7 @@ class SeeTag extends Tag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
+     * @param string $type    Tag identifier for this tag (should be 'see').
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowTag.php
index e893ce5..63e7a9a 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowTag.php
@@ -24,10 +24,10 @@ namespace phpDocumentor\Reflection\DocBlock\Tag;
 class ThrowTag extends ThrowsTag
 {
     /**
-     * Sets the type to {@throws} and lets parent parse the tag and populates the
+     * Sets the type to @throws and lets parent parse the tag and populates the
      * member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
+     * @param string $type    Tag identifier for this tag (should be 'throw').
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php
index 4066f10..58ee44a 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@throws} tag in a Docblock.
+ * Reflection class for a @throws tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php
index 05e8d0b..da0d663 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@uses} tag in a Docblock.
+ * Reflection class for a @uses tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php
index a9a8f61..f7e2493 100644
--- a/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php
+++ b/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php
@@ -13,7 +13,7 @@
 namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
- * Reflection class for a {@var} tag in a Docblock.
+ * Reflection class for a @var tag in a Docblock.
  *
  * @author  Mike van Riel <mike.vanriel@naenius.com>
  * @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -24,7 +24,7 @@ class VarTag extends ParamTag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
+     * @param string $type    Tag identifier for this tag (should be 'var').
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)