diff --git a/lib/jsduck/doc/ast.rb b/lib/jsduck/doc/ast.rb
index 3bda32a671a627acef38106319cc4e09249997ee..7c8340d38da6a922edd52915f6c5cd79c9c0e772 100644
--- a/lib/jsduck/doc/ast.rb
+++ b/lib/jsduck/doc/ast.rb
@@ -42,7 +42,6 @@ module JsDuck
       def create_class(docs, doc_map)
         return add_shared({
             :tagname => :class,
-            :name => detect_name(:class, doc_map),
             :doc => detect_doc(docs),
           }, doc_map)
       end
diff --git a/lib/jsduck/tag/class.rb b/lib/jsduck/tag/class.rb
index 0c43f0f4c4038058964b64d5621108f80a68124c..e064b806f6ed9793eccbb7317c3e907d45a3e9c0 100644
--- a/lib/jsduck/tag/class.rb
+++ b/lib/jsduck/tag/class.rb
@@ -4,6 +4,7 @@ module JsDuck::Tag
   class Class < Tag
     def initialize
       @pattern = "class"
+      @key = :class
     end
 
     # @class name
@@ -13,5 +14,9 @@ module JsDuck::Tag
         :name => p.hw.ident_chain,
       }
     end
+
+    def process_doc(tags)
+      {:name => tags[0][:name]}
+    end
   end
 end