diff --git a/lib/prmd/templates/schemata.md.erb b/lib/prmd/templates/schemata.md.erb
index 916b3502..98863946 100644
--- a/lib/prmd/templates/schemata.md.erb
+++ b/lib/prmd/templates/schemata.md.erb
@@ -9,7 +9,7 @@
   title = schemata['title'].split(' - ', 2).last
 -%>
 <%- unless options[:doc][:disable_title_and_description] %>
-<a name="#resource-<%= resource %>"></a>
+<a name="resource-<%= resource %>"></a>
 ## <%= title %>
 
 <%- if schemata['stability'] && !schemata['stability'].empty? %>
diff --git a/lib/prmd/templates/schemata/link.md.erb b/lib/prmd/templates/schemata/link.md.erb
index 00520b54..a5cb891f 100644
--- a/lib/prmd/templates/schemata/link.md.erb
+++ b/lib/prmd/templates/schemata/link.md.erb
@@ -3,7 +3,7 @@
   response_example = link['response_example']
   link_schema_properties_template = Prmd::Template.load_template('link_schema_properties.md.erb', options[:template])
 -%>
-<a name="link-<%= link['method'] %>-<%= resource %>-<%= link['href'] %>"></a>
+<a name="link-<%= link['method'].downcase %>-<%= resource %>-<%= build_link_path(schema, link) %>"></a>
 ### <%= title %> <%= link['title'] %>
 
 <details>
diff --git a/lib/prmd/templates/table_of_contents.erb b/lib/prmd/templates/table_of_contents.erb
index 718807bb..496f63b1 100644
--- a/lib/prmd/templates/table_of_contents.erb
+++ b/lib/prmd/templates/table_of_contents.erb
@@ -6,6 +6,6 @@
   <% _, schemata = schema.dereference(property) %>
 - <a href="#resource-<%= resource %>"><%= schemata['title'].split(' - ', 2).last %></a>
   <% schemata.fetch('links', []).each do |l| %>
-  - <a href="#link-<%= l['method'] %>-<%= resource %>-<%= l['href'] %>"><%= l['method'] %> <%= build_link_path(schema, l) %></a>
+  - <a href="#link-<%= l['method'].downcase %>-<%= resource %>-<%= build_link_path(schema, l) %>"><%= l['method'] %> <%= build_link_path(schema, l) %></a>
   <% end %>
 <% end %>
diff --git a/test/commands/render_test.rb b/test/commands/render_test.rb
index 68e6f581..5cb14876 100644
--- a/test/commands/render_test.rb
+++ b/test/commands/render_test.rb
@@ -39,8 +39,9 @@ def test_render_for_toc
 
     assert_match /^## The table of contents/, markdown
     assert_match '<a href="#resource-app"', markdown
-    assert_match '- <a href="#link-POST-app-/apps">POST /apps', markdown
-    assert_match '<a name="link-POST-app-/apps"></a>', markdown
+    assert_match '<a name="resource-app"', markdown
+    assert_match '- <a href="#link-post-app-/apps">POST /apps', markdown
+    assert_match '<a name="link-post-app-/apps"></a>', markdown
   end
 
   def test_render_for_example_as_an_array