diff --git a/dbus/dos-reply-time.yaml b/dbus/dbus-dos-reply-time.yaml
similarity index 100%
rename from dbus/dos-reply-time.yaml
rename to dbus/dbus-dos-reply-time.yaml
diff --git a/dbus/installed-tests.yaml b/dbus/dbus-installed-tests.yaml
similarity index 100%
rename from dbus/installed-tests.yaml
rename to dbus/dbus-installed-tests.yaml
diff --git a/predeployed-misc/dist-upgrade.yaml b/predeployed-misc/dist-upgrade.yaml
index ece54d44c29670295e5df01a6ba92fac378d2fbb..6d1418aecd69a900db7978c31abd92dfb089a6b3 100644
--- a/predeployed-misc/dist-upgrade.yaml
+++ b/predeployed-misc/dist-upgrade.yaml
@@ -1,5 +1,5 @@
 metadata:
-  name: setup-ping
+  name: dist-upgrade
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "Run a dist-upgrade on the pre-deployed image"
   maintainer: "sjoerd.simons@collabora.co.uk"
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 1e02455cd4b8297a71c517ab450d0fdfc49ba94f..c6a7f5dc8dd6e100ed18b5c51080a65998dc69ba 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -138,7 +138,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "dbus/installed-tests.yaml"
+            "testdef": "dbus/dbus-installed-tests.yaml"
           },
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
@@ -161,7 +161,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "dbus/dos-reply-time.yaml"
+            "testdef": "dbus/dbus-dos-reply-time.yaml"
           }
         ]
       }