diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte
index 7f60474..f6f2e97 100644
--- a/src/lib/components/Footer.svelte
+++ b/src/lib/components/Footer.svelte
@@ -16,7 +16,8 @@
                 target="_blank"
                 rel="noopener noreferrer"
                 aria-label="LinkedIn profile (opens in new tab)"
-                data-umami-event="linkedin profile (footer)"
+                data-umami-event="footer link"
+                data-umami-event-label="linkedin"
             >
                 <LinkedInIcon size={15} />
                 LinkedIn
@@ -28,7 +29,8 @@
                 target="_blank"
                 rel="noopener noreferrer"
                 aria-label="GitHub profile (opens in new tab)"
-                data-umami-event="github profile (footer)"
+                data-umami-event="footer link"
+                data-umami-event-label="github"
             >
                 <GithubIcon size={15} />
                 GitHub
diff --git a/src/lib/components/Hero.svelte b/src/lib/components/Hero.svelte
index 2ea9f0d..346115f 100644
--- a/src/lib/components/Hero.svelte
+++ b/src/lib/components/Hero.svelte
@@ -19,7 +19,8 @@
                 target="_blank"
                 rel="noopener noreferrer"
                 aria-label="Schedule a 30-minute intro call (opens in new tab)"
-                data-umami-event="schedule call (hero section)"
+                data-umami-event="schedule call"
+                data-umami-event-location="hero section"
             >
                 Schedule a 30-minute intro call
                 <ExternalLinkIcon aria-label="Opens in new tab" size={17} />
@@ -30,6 +31,7 @@
                 download
                 aria-label="Download Mike Fitzpatrick's resume as PDF"
                 data-umami-event="download resume"
+                data-umami-event-location="hero section"
             >
                 Download resume
                 <FiletypePdfIcon aria-label="PDF format file" size={17} />
diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 624e24f..bd0231b 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -45,32 +45,41 @@
                 <a
                     href="#what-we-do"
                     class="nav-link"
-                    data-umami-event="services (navigation)">Services</a
+                    data-umami-event="navigation"
+                    data-umami-event-label="services">Services</a
                 >
             </li>
             <li class="nav-item">
-                <a href="#impact" class="nav-link" data-umami-event="impact (navigation)"
-                    >Impact</a
+                <a
+                    href="#impact"
+                    class="nav-link"
+                    data-umami-event="navigation"
+                    data-umami-event-label="impact">Impact</a
                 >
             </li>
             <li class="nav-item">
                 <a
                     href="#how-we-work"
                     class="nav-link"
-                    data-umami-event="process (navigation)">Process</a
+                    data-umami-event="navigation"
+                    data-umami-event-label="process">Process</a
                 >
             </li>
             <li class="nav-item">
                 <a
                     href="#schedule"
                     class="nav-link"
-                    data-umami-event="contact (navigation)">Contact</a
+                    data-umami-event="navigation"
+                    data-umami-event-label="contact">Contact</a
                 >
             </li>
         </ul>
         <div class="nav-item nav-back-to-top">
-            <a href="#header" class="nav-link" data-umami-event="back to top (navigation)"
-                >Back to top</a
+            <a
+                href="#header"
+                class="nav-link"
+                data-umami-event="navigation"
+                data-umami-event-label="back to top">Back to top</a
             >
         </div>
     </div>
diff --git a/src/lib/components/ScheduleSection.svelte b/src/lib/components/ScheduleSection.svelte
index 823d95d..d6de6b2 100644
--- a/src/lib/components/ScheduleSection.svelte
+++ b/src/lib/components/ScheduleSection.svelte
@@ -16,7 +16,8 @@
             target="_blank"
             rel="noopener noreferrer"
             aria-label="Schedule a 30-minute intro call (opens in new tab)"
-            data-umami-event="schedule call (schedule section)"
+            data-umami-event="schedule call"
+            data-umami-event-location="schedule section"
         >
             Schedule a 30-minute intro call
             <ExternalLinkIcon aria-label="Opens in new tab" size={17} />