diff --git a/bedrock/base/templates/includes/site-footer.html b/bedrock/base/templates/includes/site-footer.html
index 4dd1b9496f4..5aa82668f94 100644
--- a/bedrock/base/templates/includes/site-footer.html
+++ b/bedrock/base/templates/includes/site-footer.html
@@ -1,7 +1,7 @@
       <footer id="colophon" class="{% block footer_class %}{% endblock %}">
         <nav class="row">
           <div class="col col-1">
-            <h1 class="logo"><a href="{{ url('mozorg.home') }}">Mozilla</a></h1>
+            <h1 class="logo"><a href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-name="Mozilla">Mozilla</a></h1>
             <p class="license">
               {%- trans url=url('foundation.licensing.website-content') -%}
               Portions of this content are ©1998–{{ current_year }} by individual
diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html
index d7bec3f764b..a0f8d1f3dba 100644
--- a/bedrock/base/templates/macros.html
+++ b/bedrock/base/templates/macros.html
@@ -284,7 +284,7 @@ <h3>{{ cta_text }}</h3>
     {# Page will dictate CTA (button, usually) to be placed in this wrapper #}
     <div id="fxfamilynav-cta-wrapper" class="fxfamilynav-cta-wrapper">{% if caller %}{{ caller() }}{% endif %}</div>
 
-    <button type="button" id="fxfamilynav-tertiarynav-trigger" class="fxfamilynav-tertiarynav-trigger" aria-controls="fxfamilynav-tertiarynav" data-link-type="nav" data-link-name="Open Side Menu">
+    <button type="button" id="fxfamilynav-tertiarynav-trigger" class="fxfamilynav-tertiarynav-trigger" aria-controls="fxfamilynav-tertiarynav">
       <span>{{ _('Menu') }}</span>
       <div class="trigger-dots">
         <div class="trigger-dot"></div>
diff --git a/bedrock/firefox/templates/firefox/choose.html b/bedrock/firefox/templates/firefox/choose.html
index 083b0e78425..262d430c7e7 100644
--- a/bedrock/firefox/templates/firefox/choose.html
+++ b/bedrock/firefox/templates/firefox/choose.html
@@ -30,7 +30,7 @@
 {% block alt_header %}
 <div class="header-content">
   <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>
   <h1>{{ high_res_img('firefox/choose/header-firefox.png', {'alt': 'Firefox', 'width': '223', 'height': '84'}) }}</h1>
 
diff --git a/bedrock/firefox/templates/firefox/family/index.html b/bedrock/firefox/templates/firefox/family/index.html
index 9968702b418..ca4f15e2968 100644
--- a/bedrock/firefox/templates/firefox/family/index.html
+++ b/bedrock/firefox/templates/firefox/family/index.html
@@ -56,7 +56,7 @@
     {% block tabzilla_tab %}
     <div class="content">
       <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>
     </div>
     {% endblock %}
diff --git a/bedrock/mozorg/templates/mozorg/home/home.html b/bedrock/mozorg/templates/mozorg/home/home.html
index ecddb2bffff..ecc8e13cf60 100644
--- a/bedrock/mozorg/templates/mozorg/home/home.html
+++ b/bedrock/mozorg/templates/mozorg/home/home.html
@@ -326,19 +326,19 @@ <h4>{{_('Committed to <strong>you, your privacy</strong> and an <strong>open Web
     <div class="container">
       <ul>
         <li>
-          <a class="add-ons" rel="external" href="https://addons.mozilla.org/" data-element-location="Secondary Link Clicks" data-link-type="href">
+          <a class="add-ons" rel="external" href="https://addons.mozilla.org/">
             <h2>{{ _('Add-ons') }}</h2>
             <p>{{ _('Compare prices, check the weather, listen to music, send a tweet and more right from Firefox.') }}</p>
           </a>
         </li>
         <li>
-          <a class="careers" rel="external" href="https://careers.mozilla.org/" data-element-location="Secondary Link Clicks" data-link-type="href">
+          <a class="careers" rel="external" href="https://careers.mozilla.org/">
             <h2>{{ _('Careers') }}</h2>
             <p>{{ _('Learn about the benefits of working at Mozilla and view open positions around the world.') }}</p>
           </a>
         </li>
         <li>
-          <a class="help" rel="external" href="https://support.mozilla.org/" data-element-location="Secondary Link Clicks" data-link-type="href">
+          <a class="help" rel="external" href="https://support.mozilla.org/">
             <h2>{{ _('Need help?') }}</h2>
             <p>{{ _('Get answers to your questions about Firefox and all Mozilla products from our support team.') }}</p>
           </a>
diff --git a/media/js/firefox/family-nav.js b/media/js/firefox/family-nav.js
index 78b5cbfd64d..622393819ed 100644
--- a/media/js/firefox/family-nav.js
+++ b/media/js/firefox/family-nav.js
@@ -57,9 +57,7 @@ if (typeof window.Mozilla === 'undefined') {
 
                 if ($tertiaryNavTrigger.hasClass('active')) {
                     window.dataLayer.push({
-                        'event': 'family-nav-interaction',
-                        'location': 'Side Menu',
-                        'browserAction': 'Open Menu'
+                        'event': 'open-side-menu'
                     });
                 }
             }).addClass('visible');
@@ -122,13 +120,6 @@ if (typeof window.Mozilla === 'undefined') {
             }
         };
 
-        $tertiaryNavs.on('click', 'a', function() {
-            window.dataLayer.push({
-                'event': 'family-nav-interaction',
-                'browserAction': $(this).attr('data-ga')
-            });
-        });
-
         // public interface
         return {
             init: function() {