diff --git a/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html b/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html
index 3987caeede4..624ffd118eb 100644
--- a/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html
+++ b/bedrock/firefox/templates/firefox/australis/fx38_0_5/firstrun.html
@@ -37,7 +37,7 @@
   <header id="masthead">
     {% block tabzilla_tab %}
     <div id="tabzilla">
-      <a href="{{ url('mozorg.home') }}">Mozilla</a>
+      <a href="{{ url('mozorg.home') }}" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
     </div>
     {% endblock %}
     {% block site_header_nav %}{% endblock %}
@@ -82,17 +82,17 @@ <h2>
 {% block site_footer %}
 <footer id="footer">
   <div class="container">
-    <a class="mozlogo" href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a class="mozlogo" href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a>
 
     <ul>
       <li>
-        <a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a>
+        <a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy Policy') }}</a>
       </li>
       <li>
-        <a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a>
+        <a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a>
       </li>
       <li>
-        <a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a>
+        <a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal Notices') }}</a>
       </li>
     </ul>
   </div>
diff --git a/bedrock/firefox/templates/firefox/australis/whatsnew.html b/bedrock/firefox/templates/firefox/australis/whatsnew.html
index d09b5cb2145..3524fa3586a 100644
--- a/bedrock/firefox/templates/firefox/australis/whatsnew.html
+++ b/bedrock/firefox/templates/firefox/australis/whatsnew.html
@@ -44,7 +44,7 @@ <h2>{{ _('Keep your Firefox in Sync') }}</h2>
       <p>{{ _('Access your bookmarks, passwords and more from any device.')}}</p>
     </header>
     <div class="sync-cta">
-      <a href="{{ url('firefox.sync') }}" class="button">{{ _('Get started with Sync') }}</a>
+      <a href="{{ url('firefox.sync') }}" class="button" data-link-type="button" data-link-name="Get started with Sync">{{ _('Get started with Sync') }}</a>
     </div>
   </div>
   <div class="sync-anim-wrapper">
diff --git a/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-base.html b/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-base.html
index c92c037165b..bbff34abdd5 100644
--- a/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-base.html
+++ b/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-base.html
@@ -35,7 +35,7 @@
 {% block site_header %}
 <header id="masthead">
   <div id="tabzilla">
-    <a href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a href="{{ url('mozorg.home') }}" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
   </div>
   <h2>{{ _('Congrats. You’re up to date!') }}</h2>
 </header>
@@ -45,11 +45,11 @@ <h2>{{ _('Congrats. You’re up to date!') }}</h2>
 
 {% block site_footer %}
   <footer role="contentinfo">
-    <a class="logo" href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a class="logo" href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a>
     <ul>
-      <li><a href="{{ url('privacy') }}#cookies">{{ _('Privacy Policy') }}</a></li>
-      <li><a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a></li>
-      <li><a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a></li>
+      <li><a href="{{ url('privacy') }}#cookies" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy Policy') }}</a></li>
+      <li><a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>
+      <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal Notices') }}</a></li>
     </ul>
   </footer>
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-pocket-video.html b/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-pocket-video.html
index 3c582faba30..28f6ae0c1a4 100644
--- a/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-pocket-video.html
+++ b/bedrock/firefox/templates/firefox/whatsnew_38/whatsnew-pocket-video.html
@@ -29,7 +29,7 @@ <h1>{{ _('Pocket comes to Firefox!') }}</h1>
         {{ _('<em>Sign in with your Firefox Account</em> and you can save articles, videos and more to enjoy anytime, anywhere.') }}
       </p>
       <aside>
-        <a class="try-pocket button-flat" href="https://support.mozilla.org/kb/where-pocket-button-firefox">{{ _('Try it now') }}</a>
+        <a class="try-pocket button-flat" href="https://support.mozilla.org/kb/where-pocket-button-firefox" data-link-type="button" data-link-name="Try it now">{{ _('Try it now') }}</a>
       </aside>
     </div>
   </section>
diff --git a/bedrock/firefox/templates/firefox/whatsnew_42/base.html b/bedrock/firefox/templates/firefox/whatsnew_42/base.html
index 10080e5d0ee..775f0d63cc3 100644
--- a/bedrock/firefox/templates/firefox/whatsnew_42/base.html
+++ b/bedrock/firefox/templates/firefox/whatsnew_42/base.html
@@ -39,7 +39,7 @@
 {% block site_header %}
 <header id="masthead">
   <div id="tabzilla">
-    <a href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a href="{{ url('mozorg.home') }}" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
   </div>
   {% block up_to_date_message %}
     <h2>{{ _('Congrats. You’re up to date!') }}</h2>
@@ -59,11 +59,11 @@ <h1 data-alt="{{ _('The world’s most private browsing. Only from Firefox.') }}
 
 {% block site_footer %}
   <footer role="contentinfo">
-    <a class="logo" href="{{ url('mozorg.home') }}">Mozilla</a>
+    <a class="logo" href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a>
     <ul>
-      <li><a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a></li>
-      <li><a href="{{ url('privacy.notices.websites') }}#cookies">{{ _('Cookies') }}</a></li>
-      <li><a href="{{ url('legal.index') }}">{{ _('Legal Notices') }}</a></li>
+      <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-name="Privacy">{{ _('Privacy Policy') }}</a></li>
+      <li><a href="{{ url('privacy.notices.websites') }}#cookies" data-link-type="footer" data-link-name="Cookies">{{ _('Cookies') }}</a></li>
+      <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-name="Legal">{{ _('Legal Notices') }}</a></li>
     </ul>
   </footer>
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/whatsnew_42/learnmore.html b/bedrock/firefox/templates/firefox/whatsnew_42/learnmore.html
index a764053cd1d..b4f2bbe40c1 100644
--- a/bedrock/firefox/templates/firefox/whatsnew_42/learnmore.html
+++ b/bedrock/firefox/templates/firefox/whatsnew_42/learnmore.html
@@ -22,7 +22,7 @@
 {% block up_to_date_message %}{% endblock %}
 
 {% block main_subhead %}
-  <a class="button-flat-dark" href="{{ url('firefox.private-browsing') }}" data-highlight="privateWindow" role="button">{{ _('Try the new Private Browsing') }}</a>
+  <a class="button-flat-dark" href="{{ url('firefox.private-browsing') }}" data-highlight="privateWindow" role="button" data-link-type="button" data-link-name="Try the new Private Browsing">{{ _('Try the new Private Browsing') }}</a>
 {% endblock %}
 
 {% block private_browsing_cta %}
diff --git a/bedrock/firefox/templates/firefox/whatsnew_42/whatsnew.html b/bedrock/firefox/templates/firefox/whatsnew_42/whatsnew.html
index ab638ae994b..536b7545810 100644
--- a/bedrock/firefox/templates/firefox/whatsnew_42/whatsnew.html
+++ b/bedrock/firefox/templates/firefox/whatsnew_42/whatsnew.html
@@ -13,7 +13,7 @@
 {% block body_class %}firefox-up-to-date{% endblock %}
 
 {% block main_subhead %}
-  <a class="button-flat-dark" href="{{ url('firefox.private-browsing') }}" data-highlight="privateWindow" role="button">{{ _('Try the new Private Browsing') }}</a>
+  <a class="button-flat-dark" href="{{ url('firefox.private-browsing') }}" data-highlight="privateWindow" role="button" data-link-type="button" data-link-name="Try the new Private Browsing">{{ _('Try the new Private Browsing') }}</a>
 {% endblock %}
 
 {% block private_browsing_cta %}