diff --git a/src/corpus/exports/exports.composable.ts b/src/corpus/exports/exports.composable.ts
index 8aad440..5174aea 100644
--- a/src/corpus/exports/exports.composable.ts
+++ b/src/corpus/exports/exports.composable.ts
@@ -26,7 +26,7 @@ export default function useExports(corpusId: string) {
   }
 
   async function downloadResult() {
-    matomo?.trackEvent("Corpus result", "Download export archive", corpusId);
+    matomo?.trackEvent("Corpus", "Download", "Export archive");
     const data = await mink.downloadExports(corpusId).catch(alertError);
     if (!data) return;
     downloadFile(data, getDownloadFilename());
@@ -38,7 +38,7 @@ export default function useExports(corpusId: string) {
 
   async function downloadResultFile(path: string) {
     const filename = path.split("/").pop()!;
-    matomo?.trackEvent("Corpus result", "Download export file", filename);
+    matomo?.trackEvent("Corpus", "Download", "Export file");
     const data = await mink
       .downloadExportFiles(corpusId, path)
       .catch(alertError);
diff --git a/src/corpus/job/job.composable.ts b/src/corpus/job/job.composable.ts
index dd2bcc7..e5ad4d4 100644
--- a/src/corpus/job/job.composable.ts
+++ b/src/corpus/job/job.composable.ts
@@ -26,27 +26,27 @@ export default function useJob(corpusId: string) {
   }
 
   async function runJob() {
-    matomo?.trackEvent("Corpus", "Run annotation", corpusId);
+    matomo?.trackEvent("Corpus", "Annotation", "Start");
     const info = await mink.runJob(corpusId).catch(alertError);
     corpus.value.status = info.job;
   }
 
   async function installKorp() {
-    matomo?.trackEvent("Tool", "Install corpus in Korp", corpusId);
+    matomo?.trackEvent("Corpus", "Tool install", "Korp");
     const info = await mink.installKorp(corpusId).catch(alertError);
     if (!info) return;
     corpus.value.status = info.job;
   }
 
   async function installStrix() {
-    matomo?.trackEvent("Tool", "Install corpus in Strix", corpusId);
+    matomo?.trackEvent("Corpus", "Tool install", "Strix");
     const info = await mink.installStrix(corpusId).catch(alertError);
     if (!info) return;
     corpus.value.status = info.job;
   }
 
   async function abortJob() {
-    matomo?.trackEvent("Corpus", "Abort annotation", corpusId);
+    matomo?.trackEvent("Corpus", "Annotation", "Abort");
     await mink.abortJob(corpusId).catch(alertError);
     await loadJob();
   }