diff --git a/_plugins/moneropedia.rb b/_plugins/moneropedia.rb
index 9063f4e1..40dfe469 100644
--- a/_plugins/moneropedia.rb
+++ b/_plugins/moneropedia.rb
@@ -46,7 +46,7 @@ module Jekyll
             entry = SafeYAML.load_file(entry_file)
 
             if !entry.empty?
-              @@moneropedia.push({ :terms => entry['terms'], :summary => entry['summary'] })
+              @@moneropedia.push({ :terms => entry['terms'], :summary => entry['summary'], :file => File.basename(entry_file, ".*") })
             end
           end
         end
@@ -54,7 +54,7 @@ module Jekyll
         # replace instances of @term with tooltips of the summary
         @@moneropedia.each do |entry|
           entry[:terms].each do |term|
-            content = content.gsub(/(\@#{term})\b/i, '<a href="/knowledge-base/moneropedia/' + term + '" data-toggle="tooltip" data-placement="top" data-original-title="' + entry[:summary] + '">' + term + '</a>')
+            content = content.gsub(/(\@#{term})\b/i, '<a href="/knowledge-base/moneropedia/' + entry[:file] + '" data-toggle="tooltip" data-placement="top" data-original-title="' + entry[:summary] + '">' + term + '</a>')
           end
         end
         
diff --git a/_strings_en.yml b/_strings_en.yml
index 92c90c2e..1ccf9cda 100644
--- a/_strings_en.yml
+++ b/_strings_en.yml
@@ -23,7 +23,7 @@ menu:
   running: How to Run a Monero Node
   donations: Donating and Sponsorships
   downloads: All Monero Downloads
-  merchants: Monero Merchant Directory
+  merchants: Merchants and Services Directory
   accepting: Accepting Monero Payments
   about: About Monero
   people: The People Behind Monero
diff --git a/getting-started/merchants.md b/getting-started/merchants.md
index 7eb55ef8..50ea0ead 100644
--- a/getting-started/merchants.md
+++ b/getting-started/merchants.md
@@ -1,8 +1,8 @@
 ---
 layout: static_page
-title: "Monero Merchant Directory"
+title: "Monero Merchants and Services Directory"
 title-pre-kick: "Monero "
-title-kick: "Merchant "
+title-kick: "Merchants and Services "
 title-post-kick: "Directory"
 kick-class: "purple-kicks"
 icon: "icon_merchants"