diff --git a/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html b/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
index 39a7abd1ba3..f7757123872 100644
--- a/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
+++ b/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
@@ -21,8 +21,8 @@ <h2 class="c-banner-title">{{ ftl('banner-firefox-app-store-title') }}</h2>
             <p class="show-android">{{ ftl('banner-firefox-app-store-free-google-play') }}</p>
             <p class="show-ios">{{ ftl('banner-firefox-app-store-free-app-store') }}</p>
           </div>
-          <a class="c-banner-button show-android" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
-          <a class="c-banner-link show-ios" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-button show-android ga-product-download" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-link show-ios ga-product-download" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
       </div>
     </div>
   </div>
diff --git a/bedrock/base/templates/includes/banners/mobile/focus-app-store.html b/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
index 3dc3fa9ffd6..26516386f47 100644
--- a/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
+++ b/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
@@ -21,8 +21,8 @@ <h2 class="c-banner-title">{{ ftl('banner-firefox-focus-app-store-title') }}</h2
             <p class="show-android">{{ ftl('banner-firefox-app-store-free-google-play') }}</p>
             <p class="show-ios">{{ ftl('banner-firefox-app-store-free-app-store') }}</p>
           </div>
-          <a class="c-banner-button show-android" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
-          <a class="c-banner-link show-ios" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-button show-android ga-product-download" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-link show-ios ga-product-download" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
       </div>
     </div>
   </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html
index da14febccca..6257c888b9f 100644
--- a/bedrock/firefox/templates/firefox/browsers/chromebook.html
+++ b/bedrock/firefox/templates/firefox/browsers/chromebook.html
@@ -43,7 +43,7 @@ <h1 class="mzp-u-title-xl">{{ ftl('browsers-chromebook-get-firefox-browser') }}<
     <h4 class="mzp-c-menu-list-title">{{ ftl('browsers-chromebook-dropdown-copy') }}</h4>
     <ul class="mzp-c-menu-list-list download-platform-list">
       <li class="mzp-c-menu-list-item">
-        <a href="{{ firefox_adjust_url('android', 'firefox-browsers-faq') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
+        <a href="{{ firefox_adjust_url('android', 'firefox-browsers-faq') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
           {{ ftl('browsers-chromebook-browsers-chromebook-get-firefox-for') }}
           <p><small>{{ ftl('browsers-chromebook-x86-based-chromebook') }}</small></p>
         </a>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html b/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
index acf07b15cf6..1a783033cf8 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
@@ -20,7 +20,7 @@ <h5 class="mzp-c-menu-list-title">{{ get_browser }}</h5>
     {# Download link should be locale neutral see issue 7982 #}
     <li class="mzp-c-menu-list-item"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard">{{ get_desktop }}</a></li>
   <!--<![endif]-->
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
   </ul>
 </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/index.html b/bedrock/firefox/templates/firefox/browsers/index.html
index cd7a5729719..9328af03c65 100644
--- a/bedrock/firefox/templates/firefox/browsers/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/index.html
@@ -150,8 +150,8 @@ <h2 class="c-landing-grid-title "><a class="mzp-c-cta-link" href="{{ url('firefo
       <div id="menu-mobile-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('firefox-browsers-download-for-mobile') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
           <li class="mzp-c-menu-list-item t-getapp"><a href="{{ url('firefox.mobile.get-app') }}" data-cta-type="link" data-cta-text="Get App Mobile">{{ ftl('firefox-browsers-send-me-a-link') }}</a></li>
         </ul>
       </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
index 7bbd1a03752..a5407c60eba 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
@@ -87,10 +87,10 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.androi
       <p>{{ ftl('browsers-mobile-infinitely-customizable-private') }}</p>
 
       <p id="android-download">
-        <a class="mzp-c-cta-link" href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -109,10 +109,10 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios')
       <p>{{ ftl('browsers-mobile-get-enhanced-tracking-protection') }}</p>
 
       <p id="ios-download">
-        <a class="mzp-c-cta-link" href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -133,8 +133,8 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus'
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('browsers-mobile-download') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
         </ul>
       </div>
 
diff --git a/bedrock/firefox/templates/firefox/enterprise/index.html b/bedrock/firefox/templates/firefox/enterprise/index.html
index e95f22a54e7..71e83d88f37 100644
--- a/bedrock/firefox/templates/firefox/enterprise/index.html
+++ b/bedrock/firefox/templates/firefox/enterprise/index.html
@@ -139,22 +139,22 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-windows-64-bit'
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser-msi-installer') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release-msi') }}
                 </a>
               </li>
@@ -182,12 +182,12 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-macos') }}</h3>
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
@@ -214,22 +214,22 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-windows-32-bit'
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser-msi-installer') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release-msi') }}
                 </a>
               </li>
diff --git a/bedrock/firefox/templates/firefox/home/index-master.html b/bedrock/firefox/templates/firefox/home/index-master.html
index 3994ff15dee..689ec19543a 100644
--- a/bedrock/firefox/templates/firefox/home/index-master.html
+++ b/bedrock/firefox/templates/firefox/home/index-master.html
@@ -135,11 +135,11 @@ <h4>{{ ftl('firefox-home-get-trackers-off') }}</h4>
         <h5 class="mzp-c-menu-list-title">{{ ftl('firefox-home-download-the-browser') }}</h5>
         <ul class="mzp-c-menu-list-list" id="menu-browsers">
           {# Direct users on unsupported OSes to the /new/ page, where they can read EOL messaging (see issue 13317) #}
-          <li class="mzp-c-menu-list-item menu-desktop-unsupported"><a href="{{ url('firefox.new') }}" data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-home-desktop') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-desktop-unsupported"><a href="{{ url('firefox.new') }}" class="ga-product-download"  data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-home-desktop') }}</a></li>
           {# Download link should be locale neutral see issue 7982 #}
-          <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard" data-link-name="Trackers">{{ ftl('firefox-home-desktop') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-name="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-name="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" class="ga-product-download" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard" data-link-name="Trackers">{{ ftl('firefox-home-desktop') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-name="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-name="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
         </ul>
       </div>
       <p id="test-fbc" class="js-fx-only"><a class="mzp-c-cta-link" href="https://addons.mozilla.org/firefox/addon/facebook-container/{{ referrals }}">{{ ftl('firefox-home-get-the-facebook-container') }}</a></p>
diff --git a/bedrock/firefox/templates/firefox/includes/download-button.html b/bedrock/firefox/templates/firefox/includes/download-button.html
index b2be214b10e..285023538be 100644
--- a/bedrock/firefox/templates/firefox/includes/download-button.html
+++ b/bedrock/firefox/templates/firefox/includes/download-button.html
@@ -20,7 +20,7 @@
     <ul>
       {% for plat in builds -%}
         <li><a href="{{ plat.download_link_direct or plat.download_link }}"
-               class="download-link mzp-c-button mzp-t-product"
+               class="download-link mzp-c-button mzp-t-product ga-product-download"
                data-link-type="download"
                data-download-version="{{ plat.os }}"
                {% if plat.os == 'android' %}data-download-os="Android"
@@ -57,7 +57,7 @@
   <ul class="download-list">
     {% for plat in builds %}
       <li class="os_{{ plat.os }}{% if plat.arch %} {{ plat.arch }}{% endif %}">
-        <a class="download-link button {{ button_class }} mzp-c-button mzp-t-product"
+        <a class="download-link button {{ button_class }} mzp-c-button mzp-t-product ga-product-download"
            id="{{ id }}-{{ plat.os }}"
            href="{{ plat.download_link }}"{% if plat.download_link_direct %}
            data-direct-link="{{ plat.download_link_direct }}"{% endif %}
diff --git a/bedrock/firefox/templates/firefox/includes/download-unsupported.html b/bedrock/firefox/templates/firefox/includes/download-unsupported.html
index ad3ac7f4d78..1c5e864bfef 100644
--- a/bedrock/firefox/templates/firefox/includes/download-unsupported.html
+++ b/bedrock/firefox/templates/firefox/includes/download-unsupported.html
@@ -19,12 +19,12 @@
   <p>{{ ftl('download-button-please-download-esr') }}</p>
   <div class="download-platform-list">
     <p>
-      <a class="mzp-c-button mzp-t-product download-link os_win64" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
+      <a class="mzp-c-button mzp-t-product download-link os_win64 ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
         {{ ftl('download-firefox-esr-64') }}
       </a>
     </p>
     <p>
-      <a class="mzp-c-button mzp-t-product download-link os_win" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
+      <a class="mzp-c-button mzp-t-product download-link os_win ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
         {{ ftl('download-firefox-esr-32') }}
       </a>
     </p>
@@ -42,7 +42,7 @@
   <p>{{ ftl('download-button-please-download-esr') }}</p>
 
   <div class="download-platform-list">
-    <a class="mzp-c-button mzp-t-product download-link" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
+    <a class="mzp-c-button mzp-t-product download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
       {{ ftl('download-firefox-esr') }}
     </a>
   </div>
diff --git a/bedrock/firefox/templates/firefox/products/index.html b/bedrock/firefox/templates/firefox/products/index.html
index 87430875328..626b06d3339 100644
--- a/bedrock/firefox/templates/firefox/products/index.html
+++ b/bedrock/firefox/templates/firefox/products/index.html
@@ -99,8 +99,8 @@ <h3 class="mzp-c-menu-list-title">{{ ftl('download-button-download') }}</h3>
             {# Download link should be locale neutral see issue 7982 #}
             <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard">{{ ftl('firefox-products-desktop') }}</a></li>
           <!--<![endif]-->
-          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
         </ul>
       </div>
       <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.index') }}" data-cta-type="link" data-cta-text="See all browsers">{{ ftl('firefox-products-see-all-browsers') }}</a></p>
@@ -150,8 +150,8 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus'
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('download-button-download') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_products') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_products') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_products') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_products') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
         </ul>
       </div>
 
diff --git a/bedrock/mozorg/templatetags/misc.py b/bedrock/mozorg/templatetags/misc.py
index 3554856885b..dee37993278 100644
--- a/bedrock/mozorg/templatetags/misc.py
+++ b/bedrock/mozorg/templatetags/misc.py
@@ -696,7 +696,7 @@ def lang_short(ctx):
     return locale.split("-")[0]
 
 
-def _get_adjust_link(adjust_url, app_store_url, google_play_url, redirect, locale, adgroup, creative=None):
+def _get_adjust_link(adjust_url, app_store_url, google_play_url, redirect, locale, product, adgroup, creative=None):
     link = adjust_url
     params = "campaign=www.mozilla.org&adgroup=" + adgroup
     redirect_url = None
@@ -715,10 +715,12 @@ def _get_adjust_link(adjust_url, app_store_url, google_play_url, redirect, local
     if creative:
         params += "&creative=" + creative
 
+    params += "&mz_pr=" + product
+
     if redirect_url:
-        link += "?redirect=" + quote(redirect_url, safe="") + "&" + params
+        link += "?redirect=" + quote(redirect_url, safe="") + "&" + params + "&mz_pl=" + redirect
     else:
-        link += "?" + params
+        link += "?" + params + "&mz_pl=mobile"
 
     return link
 
@@ -742,7 +744,7 @@ def firefox_adjust_url(ctx, redirect, adgroup, creative=None):
     play_store_url = settings.GOOGLE_PLAY_FIREFOX_LINK
     locale = getattr(ctx["request"], "locale", "en-US")
 
-    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, adgroup, creative)
+    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, "firefox", adgroup, creative)
 
 
 @library.global_function
@@ -764,13 +766,15 @@ def focus_adjust_url(ctx, redirect, adgroup, creative=None):
     app_store_url = settings.APPLE_APPSTORE_FOCUS_LINK
     play_store_url = settings.GOOGLE_PLAY_FOCUS_LINK
     locale = getattr(ctx["request"], "locale", "en-US")
+    product = "focus"
 
     if locale in klar_locales:
         adjust_url = settings.ADJUST_KLAR_URL
         app_store_url = settings.APPLE_APPSTORE_KLAR_LINK
         play_store_url = settings.GOOGLE_PLAY_KLAR_LINK
+        product = "klar"
 
-    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, adgroup, creative)
+    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, product, adgroup, creative)
 
 
 @library.global_function
@@ -792,7 +796,7 @@ def pocket_adjust_url(ctx, redirect, adgroup, creative=None):
     play_store_url = settings.GOOGLE_PLAY_POCKET_LINK
     locale = getattr(ctx["request"], "locale", "en-US")
 
-    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, adgroup, creative)
+    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, "pocket", adgroup, creative)
 
 
 @library.global_function
@@ -814,7 +818,7 @@ def lockwise_adjust_url(ctx, redirect, adgroup, creative=None):
     play_store_url = settings.GOOGLE_PLAY_LOCKWISE_LINK
     locale = getattr(ctx["request"], "locale", "en-US")
 
-    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, adgroup, creative)
+    return _get_adjust_link(adjust_url, app_store_url, play_store_url, redirect, locale, "lockwise", adgroup, creative)
 
 
 def _fxa_product_url(product_url, entrypoint, optional_parameters=None):
diff --git a/bedrock/mozorg/tests/test_helper_misc.py b/bedrock/mozorg/tests/test_helper_misc.py
index 2d86563bc3f..386fd5ece6b 100644
--- a/bedrock/mozorg/tests/test_helper_misc.py
+++ b/bedrock/mozorg/tests/test_helper_misc.py
@@ -905,7 +905,7 @@ def test_firefox_ios_adjust_url(self):
         assert (
             self._render("en-US", "ios", "test-page") == "https://app.adjust.com/2uo1qc?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Ffirefox-private-safe-browser%2Fid989804926"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=firefox&amp;mz_pl=ios"
         )
 
     def test_firefox_ios_adjust_url_invalid_country(self):
@@ -913,7 +913,7 @@ def test_firefox_ios_adjust_url_invalid_country(self):
         assert (
             self._render("zz", "ios", "test-page") == "https://app.adjust.com/2uo1qc?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fapp%2Ffirefox-private-safe-browser%2Fid989804926"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=firefox&amp;mz_pl=ios"
         )
 
     def test_firefox_ios_adjust_url_creative(self):
@@ -921,7 +921,7 @@ def test_firefox_ios_adjust_url_creative(self):
         assert (
             self._render("de", "ios", "test-page", "experiment-name") == "https://app.adjust.com/2uo1qc?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fde%2Fapp%2Ffirefox-private-safe-browser%2Fid989804926"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name&amp;mz_pr=firefox&amp;mz_pl=ios"
         )
 
     def test_firefox_android_adjust_url(self):
@@ -929,12 +929,15 @@ def test_firefox_android_adjust_url(self):
         assert (
             self._render("en-US", "android", "test-page") == "https://app.adjust.com/2uo1qc?redirect="
             "https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.firefox"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=firefox&amp;mz_pl=android"
         )
 
     def test_firefox_no_redirect_adjust_url(self):
         """Firefox for mobile with no redirect"""
-        assert self._render("en-US", None, "test-page") == "https://app.adjust.com/2uo1qc?campaign=www.mozilla.org&amp;adgroup=test-page"
+        assert (
+            self._render("en-US", None, "test-page") == "https://app.adjust.com/2uo1qc?"
+            "campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=firefox&amp;mz_pl=mobile"
+        )
 
 
 class TestFocusAdjustUrl(TestCase):
@@ -954,7 +957,7 @@ def test_focus_ios_adjust_url(self):
         assert (
             self._render("en-US", "ios", "test-page") == "https://app.adjust.com/b8s7qo?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=focus&amp;mz_pl=ios"
         )
 
     def test_focus_ios_adjust_url_invalid_country(self):
@@ -962,7 +965,7 @@ def test_focus_ios_adjust_url_invalid_country(self):
         assert (
             self._render("zz", "ios", "test-page") == "https://app.adjust.com/b8s7qo?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=focus&amp;mz_pl=ios"
         )
 
     def test_focus_ios_adjust_url_creative(self):
@@ -970,7 +973,7 @@ def test_focus_ios_adjust_url_creative(self):
         assert (
             self._render("fr", "ios", "test-page", "experiment-name") == "https://app.adjust.com/b8s7qo?"
             "redirect=https%3A%2F%2Fitunes.apple.com%2Ffr%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name&amp;mz_pr=focus&amp;mz_pl=ios"
         )
 
     def test_focus_android_adjust_url(self):
@@ -978,19 +981,22 @@ def test_focus_android_adjust_url(self):
         assert (
             self._render("en-US", "android", "test-page") == "https://app.adjust.com/b8s7qo?redirect="
             "https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=focus&amp;mz_pl=android"
         )
 
     def test_focus_no_redirect_adjust_url(self):
         """Firefox Focus for mobile with no redirect"""
-        assert self._render("en-US", None, "test-page") == "https://app.adjust.com/b8s7qo?campaign=www.mozilla.org&amp;adgroup=test-page"
+        assert (
+            self._render("en-US", None, "test-page") == "https://app.adjust.com/b8s7qo?"
+            "campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=focus&amp;mz_pl=mobile"
+        )
 
     def test_klar_ios_adjust_url(self):
         """Firefox Klar with an App Store URL redirect"""
         assert (
             self._render("de", "ios", "test-page") == "https://app.adjust.com/jfcx5x?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=klar&amp;mz_pl=ios"
         )
 
     def test_klar_android_adjust_url(self):
@@ -998,7 +1004,7 @@ def test_klar_android_adjust_url(self):
         assert (
             self._render("de", "android", "test-page") == "https://app.adjust.com/jfcx5x?redirect="
             "https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=klar&amp;mz_pl=android"
         )
 
 
@@ -1019,7 +1025,7 @@ def test_lockwise_ios_adjust_url(self):
         assert (
             self._render("en-US", "ios", "test-page") == "https://app.adjust.com/6tteyjo?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fid1314000270%3Fmt%3D8"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=lockwise&amp;mz_pl=ios"
         )
 
     def test_lockwise_ios_adjust_url_invalid_country(self):
@@ -1027,7 +1033,7 @@ def test_lockwise_ios_adjust_url_invalid_country(self):
         assert (
             self._render("zz", "ios", "test-page") == "https://app.adjust.com/6tteyjo?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fapp%2Fid1314000270%3Fmt%3D8"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=lockwise&amp;mz_pl=ios"
         )
 
     def test_lockwise_ios_adjust_url_creative(self):
@@ -1035,7 +1041,7 @@ def test_lockwise_ios_adjust_url_creative(self):
         assert (
             self._render("de", "ios", "test-page", "experiment-name") == "https://app.adjust.com/6tteyjo"
             "?redirect=https%3A%2F%2Fitunes.apple.com%2Fde%2Fapp%2Fid1314000270%3Fmt%3D8"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name&amp;mz_pr=lockwise&amp;mz_pl=ios"
         )
 
     def test_lockwise_android_adjust_url(self):
@@ -1043,12 +1049,15 @@ def test_lockwise_android_adjust_url(self):
         assert (
             self._render("en-US", "android", "test-page") == "https://app.adjust.com/6tteyjo?redirect="
             "https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dmozilla.lockbox"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=lockwise&amp;mz_pl=android"
         )
 
     def test_lockwise_no_redirect_adjust_url(self):
         """Firefox Lockwise for mobile with no redirect"""
-        assert self._render("en-US", None, "test-page") == "https://app.adjust.com/6tteyjo?campaign=www.mozilla.org&amp;adgroup=test-page"
+        assert (
+            self._render("en-US", None, "test-page") == "https://app.adjust.com/6tteyjo?"
+            "campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=lockwise&amp;mz_pl=mobile"
+        )
 
 
 class TestPocketAdjustUrl(TestCase):
@@ -1068,7 +1077,7 @@ def test_pocket_ios_adjust_url(self):
         assert (
             self._render("en-US", "ios", "test-page") == "https://app.adjust.com/m54twk?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fpocket-save-read-grow%2Fid309601447"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=pocket&amp;mz_pl=ios"
         )
 
     def test_pocket_ios_adjust_url_invalid_country(self):
@@ -1076,7 +1085,7 @@ def test_pocket_ios_adjust_url_invalid_country(self):
         assert (
             self._render("zz", "ios", "test-page") == "https://app.adjust.com/m54twk?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fapp%2Fpocket-save-read-grow%2Fid309601447"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=pocket&amp;mz_pl=ios"
         )
 
     def test_pocket_ios_adjust_url_creative(self):
@@ -1084,7 +1093,7 @@ def test_pocket_ios_adjust_url_creative(self):
         assert (
             self._render("de", "ios", "test-page", "experiment-name") == "https://app.adjust.com/m54twk?redirect="
             "https%3A%2F%2Fitunes.apple.com%2Fde%2Fapp%2Fpocket-save-read-grow%2Fid309601447"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;creative=experiment-name&amp;mz_pr=pocket&amp;mz_pl=ios"
         )
 
     def test_pocket_android_adjust_url(self):
@@ -1092,12 +1101,15 @@ def test_pocket_android_adjust_url(self):
         assert (
             self._render("en-US", "android", "test-page") == "https://app.adjust.com/m54twk?redirect="
             "https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.ideashower.readitlater.pro"
-            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page"
+            "&amp;campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=pocket&amp;mz_pl=android"
         )
 
     def test_pocket_no_redirect_adjust_url(self):
         """Pocket for mobile with no redirect"""
-        assert self._render("en-US", None, "test-page") == "https://app.adjust.com/m54twk?campaign=www.mozilla.org&amp;adgroup=test-page"
+        assert (
+            self._render("en-US", None, "test-page") == "https://app.adjust.com/m54twk?"
+            "campaign=www.mozilla.org&amp;adgroup=test-page&amp;mz_pr=pocket&amp;mz_pl=mobile"
+        )
 
 
 @override_settings(FXA_ENDPOINT=TEST_FXA_ENDPOINT)
diff --git a/docs/attribution/0001-analytics.rst b/docs/attribution/0001-analytics.rst
index 680aca73242..e89830d62c5 100644
--- a/docs/attribution/0001-analytics.rst
+++ b/docs/attribution/0001-analytics.rst
@@ -304,8 +304,7 @@ Properties for use with `product_download` (not all products will have all optio
 
 - product (example: firefox)
 - platform (example: win64)
-- method (store, direct, or adjust)
-- link_url
+- method (store, site, or adjust)
 - release_channel (example: nightly)
 - download_language (example: en-CA)
 
diff --git a/media/js/base/datalayer-productdownload-init.es6.js b/media/js/base/datalayer-productdownload-init.es6.js
new file mode 100644
index 00000000000..fbfee6c1a19
--- /dev/null
+++ b/media/js/base/datalayer-productdownload-init.es6.js
@@ -0,0 +1,27 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+import TrackProductDownload from './datalayer-productdownload.es6';
+
+// Create namespace
+if (typeof window.Mozilla === 'undefined') {
+    window.Mozilla = {};
+}
+
+window.Mozilla.TrackProductDownload = TrackProductDownload;
+
+// init tracking on links
+// other methods of triggering downloads (example: /thanks) are handled separately
+const productLinks = document.querySelectorAll('.ga-product-download');
+for (let i = 0; i < productLinks.length; ++i) {
+    productLinks[i].addEventListener(
+        'click',
+        function (event) {
+            TrackProductDownload.handleLink(event);
+        },
+        false
+    );
+}
diff --git a/media/js/base/datalayer-productdownload.es6.js b/media/js/base/datalayer-productdownload.es6.js
index fde2ecd686e..0d08120475d 100644
--- a/media/js/base/datalayer-productdownload.es6.js
+++ b/media/js/base/datalayer-productdownload.es6.js
@@ -7,8 +7,11 @@
 const TrackProductDownload = {};
 const prodURL = /^https:\/\/download.mozilla.org/;
 const stageURL = /^https:\/\/bouncer-bouncer.stage.mozaws.net/;
-const appStoreURL = /^https:\/\/itunes.apple.com/;
+const iTunesURL = /^https:\/\/itunes.apple.com/;
+const appStoreURL = /^https:\/\/apps.apple.com/;
 const playStoreURL = /^https:\/\/play.google.com/;
+const marketURL = /^market:\/\/play.google.com/;
+const adjustURL = /^https:\/\/app.adjust.com/;
 
 if (typeof window.dataLayer === 'undefined') {
     window.dataLayer = [];
@@ -21,11 +24,14 @@ if (typeof window.dataLayer === 'undefined') {
  */
 TrackProductDownload.isValidDownloadURL = (downloadURL) => {
     if (typeof downloadURL === 'string') {
-        if (prodURL.test(downloadURL) || stageURL.test(downloadURL)) {
-            return true;
-        } else if (
+        if (
+            prodURL.test(downloadURL) ||
+            stageURL.test(downloadURL) ||
+            iTunesURL.test(downloadURL) ||
             appStoreURL.test(downloadURL) ||
-            playStoreURL.test(downloadURL)
+            playStoreURL.test(downloadURL) ||
+            marketURL.test(downloadURL) ||
+            adjustURL.test(downloadURL)
         ) {
             return true;
         } else {
@@ -40,6 +46,7 @@ TrackProductDownload.isValidDownloadURL = (downloadURL) => {
  * Create the product_download event object
  * @param {string} product
  * @param {string} platform
+ * @param {string} method - site, store, or adjust
  * @param {string} release_channel - optional, we don't get it for ios downloads
  * @param {string} download_language - optional, we don't get it for mobile downloads
  * @returns {Object}
@@ -47,15 +54,21 @@ TrackProductDownload.isValidDownloadURL = (downloadURL) => {
 TrackProductDownload.getEventObject = (
     product,
     platform,
-    release_channel = '',
-    download_language = ''
+    method,
+    release_channel = false,
+    download_language = false
 ) => {
     const eventObject = {};
     eventObject['event'] = 'product_download';
     eventObject['product'] = product;
     eventObject['platform'] = platform;
-    eventObject['release_channel'] = release_channel;
-    eventObject['download_language'] = download_language;
+    eventObject['method'] = method;
+    if (release_channel) {
+        eventObject['release_channel'] = release_channel;
+    }
+    if (download_language) {
+        eventObject['download_language'] = download_language;
+    }
     return eventObject;
 };
 
@@ -93,40 +106,83 @@ TrackProductDownload.getEventFromUrl = (downloadURL) => {
         // product is first word of product param
         const product = productSplit[0];
         let platform = params.os;
+        // change platform to macos if it's osx
         platform = platform === 'osx' ? 'macos' : platform;
+        // append 'msi' to platform if msi is in the product parameter
+        platform =
+            productParam.indexOf('msi') !== -1 ? platform + '-msi' : platform;
         // release channel is second word of product param
-        // (except for release which says 'latest' but we want 'release')
-        const releaseChannel =
-            productSplit[1] === 'latest' ? 'release' : productSplit[1];
+        let release = productSplit[1];
+        // (except for latest, msi, or sub installer - we update those to say release)
+        if (release === 'latest' || release === 'stub' || release === 'msi') {
+            release = 'release';
+        }
 
         eventObject = TrackProductDownload.getEventObject(
             product,
             platform,
-            releaseChannel,
+            'site',
+            release,
             params.lang
         );
-    } else if (playStoreURL.test(downloadURL)) {
+    } else if (playStoreURL.test(downloadURL) || marketURL.test(downloadURL)) {
         const idParam = params.id;
-        let androidRelease = 'release';
-        // Android Play Store, need to check release, beta, nightly
+        let androidProduct = 'unrecognized';
+        let androidRelease = '';
+
         switch (idParam) {
+            case 'org.mozilla.firefox':
+                androidProduct = 'firefox';
+                androidRelease = 'release';
+                break;
             case 'org.mozilla.fenix':
+                androidProduct = 'firefox';
                 androidRelease = 'nightly';
                 break;
             case 'org.mozilla.firefox_beta':
+                androidProduct = 'firefox';
                 androidRelease = 'beta';
                 break;
+            case 'org.mozilla.focus':
+                androidProduct = 'focus';
+                break;
+            case 'org.mozilla.klar':
+                androidProduct = 'klar';
+                break;
+            case 'com.ideashower.readitlater.pro':
+                androidProduct = 'pocket';
+                break;
         }
+
         eventObject = TrackProductDownload.getEventObject(
-            'firefox',
+            androidProduct,
             'android',
+            'store',
             androidRelease
         );
-    } else if (appStoreURL.test(downloadURL)) {
+    } else if (appStoreURL.test(downloadURL) || iTunesURL.test(downloadURL)) {
+        let iosProduct = 'unrecognized';
+        if (downloadURL.indexOf('/id989804926') !== -1) {
+            iosProduct = 'firefox';
+        } else if (downloadURL.indexOf('/id1055677337') !== -1) {
+            iosProduct = 'focus';
+        } else if (downloadURL.indexOf('/id1073435754') !== -1) {
+            iosProduct = 'klar';
+        } else if (downloadURL.indexOf('/id309601447') !== -1) {
+            iosProduct = 'pocket';
+        }
         // Apple App Store
         eventObject = TrackProductDownload.getEventObject(
-            'firefox',
+            iosProduct,
             'ios',
+            'store',
+            'release'
+        );
+    } else if (adjustURL.test(downloadURL)) {
+        eventObject = TrackProductDownload.getEventObject(
+            params.mz_pr,
+            params.mz_pl,
+            'adjust',
             'release'
         );
     }
diff --git a/media/js/firefox/all/all-downloads-unified-init.es6.js b/media/js/firefox/all/all-downloads-unified-init.es6.js
index 568dac713b7..0a77ad0567d 100644
--- a/media/js/firefox/all/all-downloads-unified-init.es6.js
+++ b/media/js/firefox/all/all-downloads-unified-init.es6.js
@@ -19,9 +19,6 @@ import MzpSideMenu from '@mozilla-protocol/core/protocol/js/sidemenu';
         const downloadButton = document.getElementById(
             'download-button-primary'
         );
-        const mobileDownloadButtons = document.querySelectorAll(
-            '.ga-product-download'
-        );
 
         function showHelpModal(modalContent, modalTitle, eventLabel) {
             MzpModal.createModal(this, modalContent, {
@@ -79,16 +76,6 @@ import MzpSideMenu from '@mozilla-protocol/core/protocol/js/sidemenu';
             },
             false
         );
-
-        for (let i = 0; i < mobileDownloadButtons.length; i++) {
-            mobileDownloadButtons[i].addEventListener(
-                'click',
-                function (event) {
-                    TrackProductDownload.handleLink(event);
-                },
-                false
-            );
-        }
     }
 
     Mozilla.run(onLoad);
diff --git a/media/js/firefox/new/common/thanks-direct.js b/media/js/firefox/new/common/thanks-direct.js
index 4577b74b19a..04060722dd7 100644
--- a/media/js/firefox/new/common/thanks-direct.js
+++ b/media/js/firefox/new/common/thanks-direct.js
@@ -31,11 +31,29 @@
                 // Make sure the 'Try downloading again' link is well formatted! (issue 9615)
                 if (directDownloadLink && directDownloadLink.href) {
                     directDownloadLink.href = downloadURL;
+                    directDownloadLink.addEventListener(
+                        'click',
+                        function (event) {
+                            try {
+                                Mozilla.TrackProductDownload.handleLink(event);
+                            } catch (error) {
+                                return;
+                            }
+                        },
+                        false
+                    );
                 }
 
                 // Start the platform-detected download a second after DOM ready event.
                 Mozilla.Utils.onDocumentReady(function () {
                     setTimeout(function () {
+                        try {
+                            Mozilla.TrackProductDownload.sendEventFromURL(
+                                downloadURL
+                            );
+                        } catch (error) {
+                            return;
+                        }
                         window.location.href = downloadURL;
                     }, 1000);
                 });
diff --git a/media/js/firefox/new/common/thanks-init.js b/media/js/firefox/new/common/thanks-init.js
index f27f2ad905a..4a5c9696a3a 100644
--- a/media/js/firefox/new/common/thanks-init.js
+++ b/media/js/firefox/new/common/thanks-init.js
@@ -25,11 +25,29 @@
             // Make sure the 'Try downloading again' link is well formatted! (issue 9615)
             if (directDownloadLink && directDownloadLink.href) {
                 directDownloadLink.href = downloadURL;
+                directDownloadLink.addEventListener(
+                    'click',
+                    function (event) {
+                        try {
+                            Mozilla.TrackProductDownload.handleLink(event);
+                        } catch (error) {
+                            return;
+                        }
+                    },
+                    false
+                );
             }
 
             // Start the platform-detected download a second after DOM ready event.
             Mozilla.Utils.onDocumentReady(function () {
                 setTimeout(function () {
+                    try {
+                        Mozilla.TrackProductDownload.sendEventFromURL(
+                            downloadURL
+                        );
+                    } catch (error) {
+                        return;
+                    }
                     window.location.href = downloadURL;
                 }, 1000);
             });
diff --git a/media/static-bundles.json b/media/static-bundles.json
index ceeb5a000aa..32c663059c4 100644
--- a/media/static-bundles.json
+++ b/media/static-bundles.json
@@ -1706,7 +1706,8 @@
     {
       "files": [
         "js/base/core-datalayer.js",
-        "js/base/core-datalayer-init.js"
+        "js/base/core-datalayer-init.js",
+        "js/base/datalayer-productdownload-init.es6.js"
       ],
       "name": "data"
     },
diff --git a/tests/unit/spec/base/datalayer-productdownload.js b/tests/unit/spec/base/datalayer-productdownload.js
index d190c80d086..a8bceb34490 100644
--- a/tests/unit/spec/base/datalayer-productdownload.js
+++ b/tests/unit/spec/base/datalayer-productdownload.js
@@ -36,11 +36,17 @@ describe('TrackProductDownload.isValidDownloadURL', function () {
         );
         expect(testPlayStoreURL).toBe(true);
     });
-    it('should not accept Adjust as a valid URL', function () {
+    it('should recognize the Android Market as a valid URL', function () {
+        let testPlayStoreURL = TrackProductDownload.isValidDownloadURL(
+            'market://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
+        );
+        expect(testPlayStoreURL).toBe(true);
+    });
+    it('should recognize Adjust as a valid URL', function () {
         let testAdjustURL = TrackProductDownload.isValidDownloadURL(
             'https://app.adjust.com/2uo1qc?redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.firefox&campaign=www.mozilla.org&adgroup=mobile-android-page'
         );
-        expect(testAdjustURL).toBe(false);
+        expect(testAdjustURL).toBe(true);
     });
     it('should not accept a random link to mozilla.org as a valid URL', function () {
         let testRandomURL = TrackProductDownload.isValidDownloadURL(
@@ -56,12 +62,14 @@ describe('TrackProductDownload.getEventObject', function () {
             event: 'product_download',
             product: 'testProduct',
             platform: 'testPlatform',
+            method: 'testMethod',
             release_channel: 'testReleaseChannel',
             download_language: 'testDownloadLanguage'
         };
         let testFullEventObject = TrackProductDownload.getEventObject(
             'testProduct',
             'testPlatform',
+            'testMethod',
             'testReleaseChannel',
             'testDownloadLanguage'
         );
@@ -72,12 +80,12 @@ describe('TrackProductDownload.getEventObject', function () {
             event: 'product_download',
             product: 'testProduct',
             platform: 'testPlatform',
-            release_channel: '',
-            download_language: ''
+            method: 'testMethod'
         };
         let testShortEventObject = TrackProductDownload.getEventObject(
             'testProduct',
-            'testPlatform'
+            'testPlatform',
+            'testMethod'
         );
         expect(testShortEventObject).toEqual(testShortEventExpectedObject);
     });
@@ -86,133 +94,247 @@ describe('TrackProductDownload.getEventObject', function () {
 describe('TrackProductDownload.getEventFromUrl', function () {
     // product
     it('should identify product for Firefox Desktop', function () {
-        let testProductDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testProductDesktop['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
     });
-    it('should identify product for Firefox iOS', function () {
-        let testProductIOS = TrackProductDownload.getEventFromUrl(
+    it('should identify product for Firefox in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testProductIOS['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
     });
-    it('should identify product for Firefox Android', function () {
-        let testProductAndroid = TrackProductDownload.getEventFromUrl(
+    it('should identify product for Firefox in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testProductAndroid['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
+    });
+    it('should identify product for Firefox with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/2uo1qc?mz_pr=firefox&mz_pl=mobile'
+        );
+        expect(testEvent['product']).toBe('firefox');
+    });
+    it('should identify product for Pocket in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/pocket-save-read-grow/id309601447'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Pocket in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=com.ideashower.readitlater.pro'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Pocket with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/m54twk?mz_pr=pocket&mz_pl=mobile'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Focus in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/firefox-focus-privacy-browser/id1055677337'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Focus in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=org.mozilla.focus'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Focus with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo?mz_pr=focus&mz_pl=android'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Klar in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/klar-by-firefox/id1073435754'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product for Klar in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=org.mozilla.klar'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product for Klar with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/jfcx5x?mz_pr=klar&mz_pl=mobile'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product as unrecognized if App Store link is not found', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/us/app/49th-parallel-coffee-roasters/id1567407403'
+        );
+        expect(testEvent['product']).toBe('unrecognized');
+    });
+    it('should identify product as unrecognized if Play Store link is not found', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=co.tapcart.app.id_rBugj0qbKV'
+        );
+        expect(testEvent['product']).toBe('unrecognized');
     });
     // platform
-    it('should identify platform for Windows', function () {
-        let testPlatformWindows = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for Windows', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testPlatformWindows['platform']).toBe('win64');
+        expect(testEvent['platform']).toBe('win64');
     });
-    it('should identify platform for MacOS', function () {
-        let testPlatformMacOS = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for MacOS', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testPlatformMacOS['platform']).toBe('macos');
+        expect(testEvent['platform']).toBe('macos');
     });
-    it('should identify platform for Linux', function () {
-        let testPlatformLinux = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for Linux', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US'
         );
-        expect(testPlatformLinux['platform']).toBe('linux64');
+        expect(testEvent['platform']).toBe('linux64');
+    });
+    it('should identify platform for msi', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang=en-US'
+        );
+        expect(testEvent['platform']).toBe('win64-msi');
+    });
+    it('should identify platform for esr msi', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win64&lang=en-US'
+        );
+        expect(testEvent['platform']).toBe('win64-msi');
     });
-    it('should identify platform for iOS', function () {
-        let testPlatformIOS = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testPlatformIOS['platform']).toBe('ios');
+        expect(testEvent['platform']).toBe('ios');
     });
-    it('should identify platform for Android', function () {
-        let testPlatformAndroid = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testPlatformAndroid['platform']).toBe('android');
+        expect(testEvent['platform']).toBe('android');
+    });
+    it('should identify platform for Adjust link direct to Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo?redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus&campaign=www.mozilla.org&adgroup=mobile-focus-page&mz_pr=focus&mz_pl=android'
+        );
+        expect(testEvent['platform']).toBe('android');
+    });
+    it('should identify platform for Adjust link direct to App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo?redirect=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337&campaign=www.mozilla.org&adgroup=mobile-focus-page&mz_pr=focus&mz_pl=ios'
+        );
+        expect(testEvent['platform']).toBe('ios');
     });
     // release channel
     it('should identify release_channel for Firefox Release', function () {
-        let testReleaseRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testReleaseRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Beta', function () {
-        let testBetaRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testBetaRelease['release_channel']).toBe('beta');
+        expect(testEvent['release_channel']).toBe('beta');
     });
     it('should identify release_channel for Firefox Dev Edition', function () {
-        let testDevRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testDevRelease['release_channel']).toBe('devedition');
+        expect(testEvent['release_channel']).toBe('devedition');
     });
     it('should identify release_channel for Firefox Nightly', function () {
-        let testNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testNightlyRelease['release_channel']).toBe('nightly');
+        expect(testEvent['release_channel']).toBe('nightly');
     });
     it('should identify release_channel for Firefox ESR', function () {
-        let testNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testNightlyRelease['release_channel']).toBe('esr');
+        expect(testEvent['release_channel']).toBe('esr');
+    });
+    it('should identify release_channel for Firefox MSI', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang=en-US'
+        );
+        expect(testEvent['release_channel']).toBe('release');
+    });
+    it('should identify release_channel for Firefox ESR', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win64&lang=en-US'
+        );
+        expect(testEvent['release_channel']).toBe('esr');
     });
     it('should identify release_channel for Firefox iOS', function () {
-        let testIOSRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testIOSRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Android Release', function () {
-        let testAndroidRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testAndroidRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Android Beta', function () {
-        let testAndroidBetaRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox_beta'
         );
-        expect(testAndroidBetaRelease['release_channel']).toBe('beta');
+        expect(testEvent['release_channel']).toBe('beta');
     });
     it('should identify release_channel for Firefox Android Nightly', function () {
-        let testAndroidNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.fenix'
         );
-        expect(testAndroidNightlyRelease['release_channel']).toBe('nightly');
+        expect(testEvent['release_channel']).toBe('nightly');
     });
     // language
     it('should identify en-US for Firefox Desktop', function () {
-        let testLanguageDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testLanguageDesktop['download_language']).toBe('en-US');
+        expect(testEvent['download_language']).toBe('en-US');
     });
     it('should identify DE for Firefox Desktop', function () {
-        let testLanguageDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=de'
         );
-        expect(testLanguageDesktop['download_language']).toBe('de');
+        expect(testEvent['download_language']).toBe('de');
     });
     it('should not identify language for Firefox iOS', function () {
-        let testLanguageIOS = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testLanguageIOS['download_language']).toBeFalsy();
+        expect(testEvent['download_language']).toBeFalsy();
     });
     it('should not identify language for Firefox Android', function () {
-        let testLanguageAndroid = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testLanguageAndroid['download_language']).toBeFalsy();
+        expect(testEvent['download_language']).toBeFalsy();
+    });
+    it('should not identify language for an Adjust link', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/2uo1qc?mz_pr=focus&mz_pl=android'
+        );
+        expect(testEvent['download_language']).toBeFalsy();
     });
 });
 
@@ -258,6 +380,7 @@ describe('TrackProductDownload.handleLink', function () {
             event: 'product_download',
             product: 'firefox',
             platform: 'win64',
+            method: 'site',
             release_channel: 'release',
             download_language: 'en-CA'
         });