diff --git a/lib/jsduck/doc/ast.rb b/lib/jsduck/doc/ast.rb
index d1fd0d08249b41cb05087a03e0b65ffadf39f9b3..9079969b55170e75d1ce661845784f01b272a882 100644
--- a/lib/jsduck/doc/ast.rb
+++ b/lib/jsduck/doc/ast.rb
@@ -49,7 +49,6 @@ module JsDuck
       def create_method(docs, doc_map)
         return add_shared({
             :tagname => :method,
-            :name => detect_name(:method, doc_map),
             :doc => detect_doc(docs),
             :params => detect_params(doc_map),
             :return => detect_return(doc_map),
@@ -120,12 +119,7 @@ module JsDuck
       end
 
       def detect_name(tagname, doc_map)
-        name = extract(doc_map, tagname, :name)
-        if name
-          name
-        else
-          doc_map[:constructor] ? "constructor" : nil
-        end
+        extract(doc_map, tagname, :name)
       end
 
       def extract(doc_map, tagname, propname = nil)
diff --git a/lib/jsduck/tag/constructor.rb b/lib/jsduck/tag/constructor.rb
index 088f05cae92b396b33595c30449e20550956e445..915c7dc4a3df8f422f616fcc54cf62e4f87fdbac 100644
--- a/lib/jsduck/tag/constructor.rb
+++ b/lib/jsduck/tag/constructor.rb
@@ -4,11 +4,18 @@ module JsDuck::Tag
   class Constructor < Tag
     def initialize
       @pattern = "constructor"
+      @key = :constructor
     end
 
     # @constructor
     def parse(p)
       {:tagname => :constructor}
     end
+
+    # The method name will become "constructor" unless a separate
+    # @method tag already supplied the name.
+    def process_doc(h, tags)
+      h[:name] = "constructor" unless h[:name]
+    end
   end
 end
diff --git a/lib/jsduck/tag/method.rb b/lib/jsduck/tag/method.rb
index dec55041c28fb560b4b4a0b391af7f980ab89af2..d4c54c796f4d523a4369bf68605e9880fbfc80a1 100644
--- a/lib/jsduck/tag/method.rb
+++ b/lib/jsduck/tag/method.rb
@@ -5,6 +5,7 @@ module JsDuck::Tag
   class Method < Tag
     def initialize
       @pattern = "method"
+      @key = :method
       @member_type = :method
     end
 
@@ -15,5 +16,11 @@ module JsDuck::Tag
         :name => p.hw.ident,
       }
     end
+
+    # Onle sets the name when it's actually specified.
+    # Otherwise we might overwrite name coming from @constructor.
+    def process_doc(h, tags)
+      h[:name] = tags[0][:name] if tags[0][:name]
+    end
   end
 end