diff --git a/website/assets/js/pages/contact.page.js b/website/assets/js/pages/contact.page.js
index 917cbd832e..434121b527 100644
--- a/website/assets/js/pages/contact.page.js
+++ b/website/assets/js/pages/contact.page.js
@@ -81,7 +81,7 @@ parasails.registerPage('contact', {
 
     submittedContactForm: async function() {
       if(typeof gtag !== 'undefined'){
-        gtag('event','website_contact_forms');
+        gtag('event','fleet_website__contact_forms');
       }
       if(typeof window.lintrk !== 'undefined') {
         window.lintrk('track', { conversion_id: 18587089 });// eslint-disable-line camelcase
@@ -93,7 +93,7 @@ parasails.registerPage('contact', {
     submittedTalkToUsForm: async function() {
       this.syncing = true;
       if(typeof gtag !== 'undefined'){
-        gtag('event','website_contact_forms');
+        gtag('event','fleet_website__contact_forms');
       }
       if(typeof window.lintrk !== 'undefined') {
         window.lintrk('track', { conversion_id: 18587089 });// eslint-disable-line camelcase
diff --git a/website/assets/js/pages/docs/basic-documentation.page.js b/website/assets/js/pages/docs/basic-documentation.page.js
index d39a7fbe8b..2c40e629da 100644
--- a/website/assets/js/pages/docs/basic-documentation.page.js
+++ b/website/assets/js/pages/docs/basic-documentation.page.js
@@ -224,7 +224,7 @@ parasails.registerPage('basic-documentation', {
 
     clickSwagRequestCTA: function () {
       if(typeof gtag !== 'undefined') {
-        gtag('event','website_swag_request');
+        gtag('event','fleet_website__swag_request');
       }
       if(typeof window.lintrk !== 'undefined') {
         window.lintrk('track', { conversion_id: 18587105 });// eslint-disable-line camelcase
diff --git a/website/assets/js/pages/entrance/signup.page.js b/website/assets/js/pages/entrance/signup.page.js
index 30a925c068..e46b6a4afb 100644
--- a/website/assets/js/pages/entrance/signup.page.js
+++ b/website/assets/js/pages/entrance/signup.page.js
@@ -67,8 +67,11 @@ parasails.registerPage('signup', {
       // redirect to the /start page.
       // > (Note that we re-enable the syncing state here.  This is on purpose--
       // > to make sure the spinner stays there until the page navigation finishes.)
+      //
+      // Naming convention:  (like sails config)
+      // "Website - Sign up" becomes "fleet_website__sign_up"  (double-underscore representing hierarchy)
       if(typeof gtag !== 'undefined'){
-        gtag('event','website_sign_up');
+        gtag('event','fleet_website__sign_up');
       }
       if(typeof window.lintrk !== 'undefined') {
         window.lintrk('track', { conversion_id: 18587097 });// eslint-disable-line camelcase