diff --git a/tests/apps_startstop/kde/abrt.pm b/tests/apps_startstop/kde/abrt.pm
index 783738f2..5fa6e140 100644
--- a/tests/apps_startstop/kde/abrt.pm
+++ b/tests/apps_startstop/kde/abrt.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     # Start the application
     menu_launch_type('abrt');
-    assert_screen 'abrt_runs';
+    assert_screen 'apps_run_abrt';
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/akregator.pm b/tests/apps_startstop/kde/akregator.pm
index b148fef2..9f2f5d69 100644
--- a/tests/apps_startstop/kde/akregator.pm
+++ b/tests/apps_startstop/kde/akregator.pm
@@ -10,7 +10,7 @@ sub run {
     # Start the application
     menu_launch_type('akregator');
     # Check that it is started
-    assert_screen 'akregator_runs', timeout => 60;
+    assert_screen 'apps_run_akregator', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/ark.pm b/tests/apps_startstop/kde/ark.pm
index af961702..972c62b2 100644
--- a/tests/apps_startstop/kde/ark.pm
+++ b/tests/apps_startstop/kde/ark.pm
@@ -10,7 +10,7 @@ sub run {
     # Start the application with command
     menu_launch_type 'ark';
     # Check that it is started
-    assert_screen 'ark_runs', timeout => 60;
+    assert_screen 'apps_run_ark', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/cpteditor.pm b/tests/apps_startstop/kde/cpteditor.pm
index fef97bb8..3e94b2b2 100644
--- a/tests/apps_startstop/kde/cpteditor.pm
+++ b/tests/apps_startstop/kde/cpteditor.pm
@@ -9,7 +9,7 @@ sub run {
     my $self = shift;
     menu_launch_type 'print theme';
     # Check that it is started
-    assert_screen 'cpteditor_runs', timeout => 60;
+    assert_screen 'apps_run_cpteditor', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/cteditor.pm b/tests/apps_startstop/kde/cteditor.pm
index cf8d5575..f395785b 100644
--- a/tests/apps_startstop/kde/cteditor.pm
+++ b/tests/apps_startstop/kde/cteditor.pm
@@ -10,7 +10,7 @@ sub run {
 
     menu_launch_type 'contactthemeeditor';
     # Check that it is started
-    assert_screen 'cteditor_runs';
+    assert_screen 'apps_run_contactthemeeditor';
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/discover.pm b/tests/apps_startstop/kde/discover.pm
index cec5b02b..2bc9928b 100644
--- a/tests/apps_startstop/kde/discover.pm
+++ b/tests/apps_startstop/kde/discover.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'discover';
     # Check that it is started
-    assert_screen 'discover_runs', timeout => 60;
+    assert_screen 'apps_run_discover', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/dolphin.pm b/tests/apps_startstop/kde/dolphin.pm
index b1af9f44..740f1ff6 100644
--- a/tests/apps_startstop/kde/dolphin.pm
+++ b/tests/apps_startstop/kde/dolphin.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'dolphin';
     # Check that it is started
-    assert_screen 'dolphin_runs', timeout => 60;
+    assert_screen 'apps_run_dolphin', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/firefox.pm b/tests/apps_startstop/kde/firefox.pm
index ab6a8739..53e8a340 100644
--- a/tests/apps_startstop/kde/firefox.pm
+++ b/tests/apps_startstop/kde/firefox.pm
@@ -13,7 +13,7 @@ sub run {
     # Check that it is started; this needle is from
     # needles/firefox, it already existed before the 'apps' tests
     # were created
-    assert_screen 'firefox', timeout => 60;
+    assert_screen 'apps_run_firefox', timeout => 60;
     # Close the application
     send_key 'alt-f4';
     wait_still_screen 2;
diff --git a/tests/apps_startstop/kde/firewall.pm b/tests/apps_startstop/kde/firewall.pm
index b9c14434..0604fe95 100644
--- a/tests/apps_startstop/kde/firewall.pm
+++ b/tests/apps_startstop/kde/firewall.pm
@@ -22,7 +22,7 @@ sub run {
     wait_still_screen 3;
 
     # Check that it is started
-    assert_screen 'firewall_runs';
+    assert_screen 'apps_run_firewall';
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/gwenview.pm b/tests/apps_startstop/kde/gwenview.pm
index 545d4ee4..9fbeeea5 100644
--- a/tests/apps_startstop/kde/gwenview.pm
+++ b/tests/apps_startstop/kde/gwenview.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'gwenview';
     # Check that it is started
-    assert_screen 'gwenview_runs', timeout => 60;
+    assert_screen 'apps_run_gwenview', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/help.pm b/tests/apps_startstop/kde/help.pm
index 57fccff0..1c1779d9 100644
--- a/tests/apps_startstop/kde/help.pm
+++ b/tests/apps_startstop/kde/help.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'help';
     # Check that it is started
-    assert_screen 'help_runs', timeout => 60;
+    assert_screen 'apps_run_help', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/infocenter.pm b/tests/apps_startstop/kde/infocenter.pm
index f0f580aa..8eea91bc 100644
--- a/tests/apps_startstop/kde/infocenter.pm
+++ b/tests/apps_startstop/kde/infocenter.pm
@@ -13,7 +13,7 @@ sub run {
     # Start the application
     menu_launch_type 'info center';
     # Check that it is started
-    assert_screen 'infocenter_runs', timeout => 60;
+    assert_screen 'apps_run_infocenter', timeout => 60;
     # Open the Devices menu item.
     assert_and_click "infocenter_menu_devices";
     # If the disks module is present, open it
diff --git a/tests/apps_startstop/kde/kaddressbook.pm b/tests/apps_startstop/kde/kaddressbook.pm
index 5f95d612..eacc3427 100644
--- a/tests/apps_startstop/kde/kaddressbook.pm
+++ b/tests/apps_startstop/kde/kaddressbook.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kaddressbook';
     # Check that it is started
-    assert_screen 'kaddressbook_runs', timeout => 60;
+    assert_screen 'apps_run_kaddressbook', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kcalc.pm b/tests/apps_startstop/kde/kcalc.pm
index 48222199..eb0df2b4 100644
--- a/tests/apps_startstop/kde/kcalc.pm
+++ b/tests/apps_startstop/kde/kcalc.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kcalc';
     # Check that it is started
-    assert_screen 'kcalc_runs', timeout => 60;
+    assert_screen 'apps_run_kcalc', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kcharselect.pm b/tests/apps_startstop/kde/kcharselect.pm
index 4052a8a8..b39bf0d8 100644
--- a/tests/apps_startstop/kde/kcharselect.pm
+++ b/tests/apps_startstop/kde/kcharselect.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kcharselect';
     # Check that it is started
-    assert_screen 'kcharselect_runs', timeout => 60;
+    assert_screen 'apps_run_kcharselect', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kfind.pm b/tests/apps_startstop/kde/kfind.pm
index 0d2d1c0c..2acecc34 100644
--- a/tests/apps_startstop/kde/kfind.pm
+++ b/tests/apps_startstop/kde/kfind.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kfind';
     # Check that it is started
-    assert_screen 'kfind_runs', timeout => 60;
+    assert_screen 'apps_run_kfind', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kgpg.pm b/tests/apps_startstop/kde/kgpg.pm
index bed46a50..1d26bed6 100644
--- a/tests/apps_startstop/kde/kgpg.pm
+++ b/tests/apps_startstop/kde/kgpg.pm
@@ -29,7 +29,7 @@ sub run {
     assert_and_click 'kde_cancel_button';
     wait_still_screen 2;
     # Check that it is started
-    assert_screen 'kgpg_runs';
+    assert_screen 'apps_run_kgpg';
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kimport.pm b/tests/apps_startstop/kde/kimport.pm
index 22eeb6c1..6307ac3f 100644
--- a/tests/apps_startstop/kde/kimport.pm
+++ b/tests/apps_startstop/kde/kimport.pm
@@ -14,7 +14,7 @@ sub run {
     assert_and_click 'kde_ok';
     wait_still_screen 2;
     # Check that it is started
-    assert_screen 'kimport_runs', timeout => 60;
+    assert_screen 'apps_run_kimport', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kmag.pm b/tests/apps_startstop/kde/kmag.pm
index bae15722..c441f17b 100644
--- a/tests/apps_startstop/kde/kmag.pm
+++ b/tests/apps_startstop/kde/kmag.pm
@@ -14,7 +14,7 @@ sub run {
     # Start the application
     menu_launch_type 'kmag';
     # Check that it is started
-    assert_screen 'kmag_runs', timeout => 60;
+    assert_screen 'apps_run_kmag', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/docviewer.pm b/tests/apps_startstop/kde/okular.pm
similarity index 86%
rename from tests/apps_startstop/kde/docviewer.pm
rename to tests/apps_startstop/kde/okular.pm
index a5e401da..4103b797 100644
--- a/tests/apps_startstop/kde/docviewer.pm
+++ b/tests/apps_startstop/kde/okular.pm
@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'okular';
     # Check that it is started
-    assert_screen 'docviewer_runs', timeout => 60;
+    assert_screen 'apps_run_okular', timeout => 60;
     # Close the application
     quit_with_shortcut();
 }