diff --git a/src/DocBlock/Tags/Generic.php b/src/DocBlock/Tags/Generic.php
index 634fdb3..7c62346 100644
--- a/src/DocBlock/Tags/Generic.php
+++ b/src/DocBlock/Tags/Generic.php
@@ -68,7 +68,7 @@ class Generic extends BaseTag
      */
     public function __toString()
     {
-        return $this->getName() . ($this->description ? ' ' . $this->description->render() : '');
+        return '@' . $this->getName() . ($this->description ? ' ' . $this->description->render() : '');
     }
 
     /**
diff --git a/tests/unit/DocBlock/DescriptionTest.php b/tests/unit/DocBlock/DescriptionTest.php
index e266f76..b5917a9 100644
--- a/tests/unit/DocBlock/DescriptionTest.php
+++ b/tests/unit/DocBlock/DescriptionTest.php
@@ -24,7 +24,7 @@ class DescriptionTest extends \PHPUnit_Framework_TestCase
     /**
      * @covers ::__construct
      * @covers ::render
-     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      */
@@ -49,7 +49,7 @@ class DescriptionTest extends \PHPUnit_Framework_TestCase
      * @covers ::__construct
      * @covers ::render
      * @covers ::__toString
-     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      */
diff --git a/tests/unit/DocBlock/SerializerTest.php b/tests/unit/DocBlock/SerializerTest.php
index 8f6ab17..cb2b400 100644
--- a/tests/unit/DocBlock/SerializerTest.php
+++ b/tests/unit/DocBlock/SerializerTest.php
@@ -28,7 +28,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
      * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses phpDocumentor\Reflection\DocBlock
      * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testReconstructsADocCommentFromADocBlock()
     {
@@ -62,7 +62,7 @@ DOCCOMMENT;
      * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses phpDocumentor\Reflection\DocBlock
      * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testAddPrefixToDocBlock()
     {
@@ -96,7 +96,7 @@ DOCCOMMENT;
      * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses phpDocumentor\Reflection\DocBlock
      * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testAddPrefixToDocBlockExceptFirstLine()
     {
@@ -130,7 +130,7 @@ DOCCOMMENT;
      * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses phpDocumentor\Reflection\DocBlock
      * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testWordwrapsAroundTheGivenAmountOfCharacters()
     {
diff --git a/tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php b/tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php
index 8f87b99..045a197 100644
--- a/tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php
+++ b/tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php
@@ -25,7 +25,7 @@ class PassthroughFormatterTest extends \PHPUnit_Framework_TestCase
      * @covers ::format
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Other
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testFormatterCallsToStringAndReturnsAStandardRepresentation()
     {
diff --git a/tests/unit/DocBlock/Tags/GenericTest.php b/tests/unit/DocBlock/Tags/GenericTest.php
index a844f68..097db1e 100644
--- a/tests/unit/DocBlock/Tags/GenericTest.php
+++ b/tests/unit/DocBlock/Tags/GenericTest.php
@@ -47,7 +47,7 @@ class GenericTest extends \PHPUnit_Framework_TestCase
     {
         $fixture = new Generic('generic', new Description('Description'));
 
-        $this->assertSame('generic Description', $fixture->render());
+        $this->assertSame('@generic Description', $fixture->render());
     }
 
     /**
@@ -89,7 +89,7 @@ class GenericTest extends \PHPUnit_Framework_TestCase
     {
         $fixture = new Generic('generic', new Description('Description'));
 
-        $this->assertSame('generic Description', (string)$fixture);
+        $this->assertSame('@generic Description', (string)$fixture);
     }
 
     /**
@@ -111,7 +111,7 @@ class GenericTest extends \PHPUnit_Framework_TestCase
 
         $fixture = Generic::create('My Description', 'generic', $descriptionFactory, $context);
 
-        $this->assertSame('generic My Description', (string)$fixture);
+        $this->assertSame('@generic My Description', (string)$fixture);
         $this->assertSame($generics, $fixture->getName());
         $this->assertSame($description, $fixture->getDescription());
     }