diff --git a/needles/kde/apps/apps_run_kcharselect-20220112.json b/needles/kde/apps/apps_run_kcharselect-20220112.json
index de0ac865..870ec265 100644
--- a/needles/kde/apps/apps_run_kcharselect-20220112.json
+++ b/needles/kde/apps/apps_run_kcharselect-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kcharselect_runs"
+    "apps_run_kcharselect"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kcharselect-20231130.json b/needles/kde/apps/apps_run_kcharselect-20231130.json
index e861f38c..862d19b7 100644
--- a/needles/kde/apps/apps_run_kcharselect-20231130.json
+++ b/needles/kde/apps/apps_run_kcharselect-20231130.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kcharselect_runs"
+    "apps_run_kcharselect"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kgpg-20220301.json b/needles/kde/apps/apps_run_kgpg-20220301.json
index 9317b5a5..ba2fb3d5 100644
--- a/needles/kde/apps/apps_run_kgpg-20220301.json
+++ b/needles/kde/apps/apps_run_kgpg-20220301.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kgpg_runs"
+    "apps_run_kgpg"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kgpg-20240103.json b/needles/kde/apps/apps_run_kgpg-20240103.json
index 7ed38113..5b95e2c7 100644
--- a/needles/kde/apps/apps_run_kgpg-20240103.json
+++ b/needles/kde/apps/apps_run_kgpg-20240103.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kgpg_runs"
+    "apps_run_kgpg"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kimport-20220112.json b/needles/kde/apps/apps_run_kimport-20220112.json
index d5818731..3e787a70 100644
--- a/needles/kde/apps/apps_run_kimport-20220112.json
+++ b/needles/kde/apps/apps_run_kimport-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kimport_runs"
+    "apps_run_kimport"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kmag-20220112.json b/needles/kde/apps/apps_run_kmag-20220112.json
index d90c816a..5897149d 100644
--- a/needles/kde/apps/apps_run_kmag-20220112.json
+++ b/needles/kde/apps/apps_run_kmag-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kmag_runs"
+    "apps_run_kmag"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kmail-hedit-20220112.json b/needles/kde/apps/apps_run_kmail-hedit-20220112.json
index 3366fc15..e93c2493 100644
--- a/needles/kde/apps/apps_run_kmail-hedit-20220112.json
+++ b/needles/kde/apps/apps_run_kmail-hedit-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kmail_hedit_runs"
+    "apps_run_kmail-header"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kolourpaint-20220112.json b/needles/kde/apps/apps_run_kolourpaint-20220112.json
index 6f295ff4..ee2e1e34 100644
--- a/needles/kde/apps/apps_run_kolourpaint-20220112.json
+++ b/needles/kde/apps/apps_run_kolourpaint-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kolourpaint_runs"
+    "apps_run_kolourpaint"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_korganizer-20220112.json b/needles/kde/apps/apps_run_korganizer-20220112.json
index 60be51ad..231b77b2 100644
--- a/needles/kde/apps/apps_run_korganizer-20220112.json
+++ b/needles/kde/apps/apps_run_korganizer-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "korganizer_runs"
+    "apps_run_korganizer"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kparted-20220112.json b/needles/kde/apps/apps_run_kparted-20220112.json
index 9cc2383d..70ed0629 100644
--- a/needles/kde/apps/apps_run_kparted-20220112.json
+++ b/needles/kde/apps/apps_run_kparted-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kparted_runs"
+    "apps_run_kparted"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_kparted-20240504.json b/needles/kde/apps/apps_run_kparted-20240504.json
index 1f83a60a..a4dcc06b 100644
--- a/needles/kde/apps/apps_run_kparted-20240504.json
+++ b/needles/kde/apps/apps_run_kparted-20240504.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kparted_runs"
+    "apps_run_kparted"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_krdc-20220112.json b/needles/kde/apps/apps_run_krdc-20220112.json
index ecb7277a..201a397c 100644
--- a/needles/kde/apps/apps_run_krdc-20220112.json
+++ b/needles/kde/apps/apps_run_krdc-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "krdc_runs"
+    "apps_run_krdc"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_krdc-20230921.json b/needles/kde/apps/apps_run_krdc-20230921.json
index 67bd637b..3e6d91db 100644
--- a/needles/kde/apps/apps_run_krdc-20230921.json
+++ b/needles/kde/apps/apps_run_krdc-20230921.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "krdc_runs"
+    "apps_run_krdc"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_krfb-20220315.json b/needles/kde/apps/apps_run_krfb-20220315.json
index 2a3f6c61..f83ba9bb 100644
--- a/needles/kde/apps/apps_run_krfb-20220315.json
+++ b/needles/kde/apps/apps_run_krfb-20220315.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "krfb_runs"
+    "apps_run_krfb"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_krfb-20230207.json b/needles/kde/apps/apps_run_krfb-20230207.json
index ca0eecce..2c4b8427 100644
--- a/needles/kde/apps/apps_run_krfb-20230207.json
+++ b/needles/kde/apps/apps_run_krfb-20230207.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "krfb_runs"
+    "apps_run_krfb"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_ktnef-20220112.json b/needles/kde/apps/apps_run_ktnef-20220112.json
index 0b0344e9..cd08da87 100644
--- a/needles/kde/apps/apps_run_ktnef-20220112.json
+++ b/needles/kde/apps/apps_run_ktnef-20220112.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "ktnef_runs"
+    "apps_run_ktnef"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_libreoffice-calc-20210304.json b/needles/kde/apps/apps_run_libreoffice-calc-20210304.json
index bee1589a..a326e7bc 100644
--- a/needles/kde/apps/apps_run_libreoffice-calc-20210304.json
+++ b/needles/kde/apps/apps_run_libreoffice-calc-20210304.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "lcalc_runs"
+    "apps_run_calc"
   ]
 }
diff --git a/needles/kde/apps/apps_run_libreoffice-impress-20210825.json b/needles/kde/apps/apps_run_libreoffice-impress-20210825.json
index 190241bc..46b40fa2 100644
--- a/needles/kde/apps/apps_run_libreoffice-impress-20210825.json
+++ b/needles/kde/apps/apps_run_libreoffice-impress-20210825.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "limpress_runs"
+    "apps_run_impress"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_libreoffice-writer-20210825.json b/needles/kde/apps/apps_run_libreoffice-writer-20210825.json
index 21715cf3..e6a89831 100644
--- a/needles/kde/apps/apps_run_libreoffice-writer-20210825.json
+++ b/needles/kde/apps/apps_run_libreoffice-writer-20210825.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "lwriter_runs"
+    "apps_run_writer"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/apps_run_libreoffice-writer-20231130.json b/needles/kde/apps/apps_run_libreoffice-writer-20231130.json
index 67402851..26e93ee4 100644
--- a/needles/kde/apps/apps_run_libreoffice-writer-20231130.json
+++ b/needles/kde/apps/apps_run_libreoffice-writer-20231130.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "lwriter_runs"
+    "apps_run_writer"
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/applications/keyring/keyring_password.pm b/tests/applications/keyring/keyring_password.pm
index bfde6409..7ee08c7f 100644
--- a/tests/applications/keyring/keyring_password.pm
+++ b/tests/applications/keyring/keyring_password.pm
@@ -66,7 +66,7 @@ sub connect_localhost {
         # try and avoid double-typing issues
         kde_doublek_workaround;
         menu_launch_type("konsole");
-        assert_screen("konsole_runs");
+        assert_screen("apps_run_konsole");
         # Export the environmental variables, this is needed for the process
         # to work correctly.
         export_kde_vars();
diff --git a/tests/applications/keyring/keyring_passwordless.pm b/tests/applications/keyring/keyring_passwordless.pm
index 88641c9c..376de96a 100644
--- a/tests/applications/keyring/keyring_passwordless.pm
+++ b/tests/applications/keyring/keyring_passwordless.pm
@@ -37,7 +37,7 @@ sub connect_localhost {
         # try and avoid double-typing issues
         kde_doublek_workaround;
         menu_launch_type("konsole");
-        assert_screen("konsole_runs");
+        assert_screen("apps_run_konsole");
         export_kde_vars();
     }
 
diff --git a/tests/apps_startstop/kde/kmail_header.pm b/tests/apps_startstop/kde/kmail_header.pm
index fb16247e..1c9c851c 100644
--- a/tests/apps_startstop/kde/kmail_header.pm
+++ b/tests/apps_startstop/kde/kmail_header.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kmail header';
     # Check that the application runs
-    assert_screen 'apps_run_kmail_header', timeout => 60;
+    assert_screen 'apps_run_kmail-header', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm
index be52159d..fb7fd3ba 100644
--- a/tests/desktop_update_graphical.pm
+++ b/tests/desktop_update_graphical.pm
@@ -28,7 +28,7 @@ sub run {
         menu_launch_type('discover');
         # Wait for it to run and maximize it to make sure we see the
         # Updates entry
-        assert_screen('discover_runs');
+        assert_screen('apps_run_discover');
         wait_still_screen 2;
         wait_screen_change { send_key "super-pgup"; };
         wait_still_screen 2;