automated: manual: update format string to match LAVA expectations

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

103 files changed, 103 insertions, 103 deletions

diff --git a/automated/android/adb-join-wifi/adb-join-wifi.yaml b/automated/android/adb-join-wifi/adb-join-wifi.yaml
index 85df4551..2bde260c 100644
--- a/automated/android/adb-join-wifi/adb-join-wifi.yaml
+++ b/automated/android/adb-join-wifi/adb-join-wifi.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: adb-join-wifi
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tradefed based tests in LAVA."
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/apk-automation/apk-automation.yaml b/automated/android/apk-automation/apk-automation.yaml
index 6fcafe7e..4b6d32cd 100644
--- a/automated/android/apk-automation/apk-automation.yaml
+++ b/automated/android/apk-automation/apk-automation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: apk-automation
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Automate testing with Android APK."
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/bionic-benchmarks/bionic-benchmarks.yaml b/automated/android/bionic-benchmarks/bionic-benchmarks.yaml
index 94bf56a3..eb64cf76 100644
--- a/automated/android/bionic-benchmarks/bionic-benchmarks.yaml
+++ b/automated/android/bionic-benchmarks/bionic-benchmarks.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: bionic-benchmarks-with-units
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Collect the bionic-benchmarks data and try to analyse it."
     maintainer:
         - daniel.diaz@linaro.org
diff --git a/automated/android/bionic-libc-tests/bionic-libc-tests.yaml b/automated/android/bionic-libc-tests/bionic-libc-tests.yaml
index 335076a0..5e5fb236 100644
--- a/automated/android/bionic-libc-tests/bionic-libc-tests.yaml
+++ b/automated/android/bionic-libc-tests/bionic-libc-tests.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: bionic-libc-tests
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Execute all available bionic-libc-tests and fetch data."
     maintainer:
         - daniel.diaz@linaro.org
diff --git a/automated/android/bootchart/bootchart.yaml b/automated/android/bootchart/bootchart.yaml
index a303be5b..1b1f6d70 100644
--- a/automated/android/bootchart/bootchart.yaml
+++ b/automated/android/bootchart/bootchart.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: bootchart
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Collect the bootchart data and try to analyse."
     maintainer:
         - yongqin.liu@linaro.org
diff --git a/automated/android/bootstat/bootstat_v1.yaml b/automated/android/bootstat/bootstat_v1.yaml
index 4eb6596c..857b581d 100644
--- a/automated/android/bootstat/bootstat_v1.yaml
+++ b/automated/android/bootstat/bootstat_v1.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: bootstat
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "collect the bootstat data and try to analyse
                   Please Note:
                     This yaml test definition is only for LAVA V1"
diff --git a/automated/android/boottime/boottime.yaml b/automated/android/boottime/boottime.yaml
index 791aeeda..e294f3a6 100644
--- a/automated/android/boottime/boottime.yaml
+++ b/automated/android/boottime/boottime.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: boottime
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "collect the boottime data many times and try to analyse,
                   when run more than 4 times(including), the average will be
                   calculated without the maximum and the minmun, if run less
diff --git a/automated/android/dd-wr-speed/dd-wr-speed.yaml b/automated/android/dd-wr-speed/dd-wr-speed.yaml
index fa4b5ee1..b2ecf49a 100644
--- a/automated/android/dd-wr-speed/dd-wr-speed.yaml
+++ b/automated/android/dd-wr-speed/dd-wr-speed.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: dd-speed-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "dd write/read speed test."
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/android/ion-monitor-tool/ion-monitor-tool.yaml b/automated/android/ion-monitor-tool/ion-monitor-tool.yaml
index 198661fe..2c18f264 100644
--- a/automated/android/ion-monitor-tool/ion-monitor-tool.yaml
+++ b/automated/android/ion-monitor-tool/ion-monitor-tool.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ion-monitor-tool
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run ion monitor tool to check memory leaks."
     maintainer:
         - axel.lebourhis@linaro.org
diff --git a/automated/android/libc-bench/libc-bench.yaml b/automated/android/libc-bench/libc-bench.yaml
index ddc9237b..46960740 100644
--- a/automated/android/libc-bench/libc-bench.yaml
+++ b/automated/android/libc-bench/libc-bench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: libc-bench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run libc-bench to benchmark the performance of bionic.
                   The source can be viewed here:
                   https://android-git.linaro.org/platform/external/libc-bench"
diff --git a/automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml b/automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml
index 0f0d9da3..fa60fdbe 100644
--- a/automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml
+++ b/automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: linaro-android-kernel-tests
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Linaro Android kernel test suite comprises of kernel feature
                   tests which are uniquie to android. The test suite runs
                   following kernel tests: ashmem, ashmem-expanded, alarmdev,
diff --git a/automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml b/automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml
index 2c3ed076..15a5a1e3 100644
--- a/automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml
+++ b/automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: media-codecs-functional-tests
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Media functional codecs test suite for linaro android
                   verifies arm based audio/video software codecs available in
                   Android AOSP release. These codecs are used in implementation
diff --git a/automated/android/meminfo/meminfo.yaml b/automated/android/meminfo/meminfo.yaml
index 69fd4842..6c800610 100644
--- a/automated/android/meminfo/meminfo.yaml
+++ b/automated/android/meminfo/meminfo.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: meminfo
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Collect the information in /proc/meminfo after boot."
     maintainer:
         - yongqin.liu@linaro.org
diff --git a/automated/android/microbenchmarks/microbenchmarks.yaml b/automated/android/microbenchmarks/microbenchmarks.yaml
index 0208cc3b..19690e70 100644
--- a/automated/android/microbenchmarks/microbenchmarks.yaml
+++ b/automated/android/microbenchmarks/microbenchmarks.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: microbenchmarks
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run ART microbenchmarks."
     maintainer:
         - vishal.bhoj@linaro.org
diff --git a/automated/android/monkey/monkey.yaml b/automated/android/monkey/monkey.yaml
index 42bd0c1f..3b88318b 100755
--- a/automated/android/monkey/monkey.yaml
+++ b/automated/android/monkey/monkey.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: monkey
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Monkey performs stress testing for stability using monkey
                   command which generates pesudo-random streams of user events
                   such as clicks, touches, or gestures as well as some system
diff --git a/automated/android/multinode/connect-to-remote-adb-tcpip-devices.yaml b/automated/android/multinode/connect-to-remote-adb-tcpip-devices.yaml
index 3dc2e425..8a135037 100644
--- a/automated/android/multinode/connect-to-remote-adb-tcpip-devices.yaml
+++ b/automated/android/multinode/connect-to-remote-adb-tcpip-devices.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: connect-to-remote-adb-tcpip-devices
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "adb MultiNode setup: connect to remote devices made accessible via adb TCP/IP."
     maintainer:
         - karsten@fairphone.com
diff --git a/automated/android/multinode/release-remote-adb-tcpip-devices.yaml b/automated/android/multinode/release-remote-adb-tcpip-devices.yaml
index c28c22e3..0e239cfc 100644
--- a/automated/android/multinode/release-remote-adb-tcpip-devices.yaml
+++ b/automated/android/multinode/release-remote-adb-tcpip-devices.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: release-remote-adb-tcpip-devices
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Disconnect from remote adb devices and cleanup."
     maintainer:
         - karsten@fairphone.com
diff --git a/automated/android/multinode/remote-adb-devices-smoke-test.yaml b/automated/android/multinode/remote-adb-devices-smoke-test.yaml
index 838b866f..c7b65c89 100644
--- a/automated/android/multinode/remote-adb-devices-smoke-test.yaml
+++ b/automated/android/multinode/remote-adb-devices-smoke-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: remote-adb-devices-smoke-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Smoke test demonstrating access to adb devices over TCP/IP."
     maintainer:
         - karsten@fairphone.com
diff --git a/automated/android/multinode/share-local-device-over-adb-tcpip.yaml b/automated/android/multinode/share-local-device-over-adb-tcpip.yaml
index 9ede1dff..a8ea6378 100644
--- a/automated/android/multinode/share-local-device-over-adb-tcpip.yaml
+++ b/automated/android/multinode/share-local-device-over-adb-tcpip.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: share-local-device-over-adb-tcpip
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "adb MultiNode setup: make local device remotely accessible via adb TCP/IP.
         Handles the device over to a role that responds to the following synchronization steps:
         - lava-sync start_handover
diff --git a/automated/android/multinode/tradefed/tradefed-multinode.yaml b/automated/android/multinode/tradefed/tradefed-multinode.yaml
index d6728df2..eff55021 100644
--- a/automated/android/multinode/tradefed/tradefed-multinode.yaml
+++ b/automated/android/multinode/tradefed/tradefed-multinode.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: cts
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tradefed based tests in LAVA."
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/multinode/wait-and-keep-local-device-accessible.yaml b/automated/android/multinode/wait-and-keep-local-device-accessible.yaml
index 720fedf9..bd638622 100644
--- a/automated/android/multinode/wait-and-keep-local-device-accessible.yaml
+++ b/automated/android/multinode/wait-and-keep-local-device-accessible.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: wait-and-keep-local-device-accessible
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Continuously wait for MultiNode messages from a remote role (master) and make the
         locally connected device accessible again when it is lost for the remote role."
     maintainer:
diff --git a/automated/android/multinode/wait-for-release-and-reset.yaml b/automated/android/multinode/wait-for-release-and-reset.yaml
index 78a52b45..291609ec 100644
--- a/automated/android/multinode/wait-for-release-and-reset.yaml
+++ b/automated/android/multinode/wait-for-release-and-reset.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: wait-for-release-and-reset
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Wait until a remote MultiNode role (master) requests to release the device.
         Then, bring the device back into adb USB state."
     maintainer:
diff --git a/automated/android/noninteractive-tradefed/tradefed.yaml b/automated/android/noninteractive-tradefed/tradefed.yaml
index a9c18029..6d50b8a0 100644
--- a/automated/android/noninteractive-tradefed/tradefed.yaml
+++ b/automated/android/noninteractive-tradefed/tradefed.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: cts
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tradefed based tests in LAVA."
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml b/automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml
index 1b9443d0..5483e306 100755
--- a/automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml
+++ b/automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: optee-gtest-gatekeeper-keymaster
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "gatekeeper and keymaster gtests"
     maintainer:
         - victor.chong@linaro.org
diff --git a/automated/android/optee/optee-gtest-kmgk.yaml b/automated/android/optee/optee-gtest-kmgk.yaml
index 65e0e502..83568847 100755
--- a/automated/android/optee/optee-gtest-kmgk.yaml
+++ b/automated/android/optee/optee-gtest-kmgk.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: optee-gtest-kmgk
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "OP-TEE KMGK gtest"
     maintainer:
         - victor.chong@linaro.org
diff --git a/automated/android/optee/optee-xtest.yaml b/automated/android/optee/optee-xtest.yaml
index 23ce8a41..2b49a426 100755
--- a/automated/android/optee/optee-xtest.yaml
+++ b/automated/android/optee/optee-xtest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: optee-xtest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "OP-TEE sanity test suite"
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/android/piglit-gles2/piglit-gles2.yaml b/automated/android/piglit-gles2/piglit-gles2.yaml
index 83ffa2a6..b7734792 100644
--- a/automated/android/piglit-gles2/piglit-gles2.yaml
+++ b/automated/android/piglit-gles2/piglit-gles2.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: piglit-gles2
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Piglit is a collection of automated tests for OpenGL
                   implementations. piglit_gles2.0 runs OpenGL ES 2.0 tests."
     maintainer:
diff --git a/automated/android/piglit-gles3/piglit-gles3.yaml b/automated/android/piglit-gles3/piglit-gles3.yaml
index 43cc4379..ae153730 100644
--- a/automated/android/piglit-gles3/piglit-gles3.yaml
+++ b/automated/android/piglit-gles3/piglit-gles3.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: piglit-gles3
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Piglit is a collection of automated tests for OpenGL
                   implementations. piglit_gles3.0 runs OpenGL ES 3.0 tests."
     maintainer:
diff --git a/automated/android/piglit-glslparser/piglit-glslparser.yaml b/automated/android/piglit-glslparser/piglit-glslparser.yaml
index c5bad200..19887665 100644
--- a/automated/android/piglit-glslparser/piglit-glslparser.yaml
+++ b/automated/android/piglit-glslparser/piglit-glslparser.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: piglit-glslparser
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "piglit glslparser test for android. The GLSL Parser provides
                   a front end for parsing and operating on OpenGL Shading
                   Language code. "
diff --git a/automated/android/piglit-shader-runner/piglit-shader-runner.yaml b/automated/android/piglit-shader-runner/piglit-shader-runner.yaml
index 42193cac..f13300ce 100644
--- a/automated/android/piglit-shader-runner/piglit-shader-runner.yaml
+++ b/automated/android/piglit-shader-runner/piglit-shader-runner.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: piglit-shader-runner
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Piglit shader_runner test suite for android. The test suite
                   runs shader tests using OpenGL shaders."
     maintainer:
diff --git a/automated/android/pm-qa/pm-qa.yaml b/automated/android/pm-qa/pm-qa.yaml
index 90b5a822..68905762 100644
--- a/automated/android/pm-qa/pm-qa.yaml
+++ b/automated/android/pm-qa/pm-qa.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pm-qa
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Test power management (PM-QA). Currently, the test runs
                   cpufreq, cpuidle, cpuhotplug, thermal and cputopology by
                   default and individual test can be run by setting TESTS
diff --git a/automated/android/stringbench/stringbench.yaml b/automated/android/stringbench/stringbench.yaml
index ec58bce4..ceea092e 100644
--- a/automated/android/stringbench/stringbench.yaml
+++ b/automated/android/stringbench/stringbench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: stringbench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run stringbench command to benchmark the performance of
                   string relevant feature of bionic. In the feature this test
                   should be upstream to bionic-benchmarks.
diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml
index 0d5822d9..ae5ae002 100644
--- a/automated/android/tradefed/tradefed.yaml
+++ b/automated/android/tradefed/tradefed.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: cts
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tradefed based tests in LAVA."
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/wait-single-boot-completed.yaml b/automated/android/wait-single-boot-completed.yaml
index ea8f0621..f35c02be 100644
--- a/automated/android/wait-single-boot-completed.yaml
+++ b/automated/android/wait-single-boot-completed.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: wait-single-boot-completed
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Wait until one locally attached Android device is completely booted.
         Usable only if at most one device is visible to adb, but has the advantage that the device's
         serial number does not need to be known in advance."
diff --git a/automated/android/wait-single-network-connected.yaml b/automated/android/wait-single-network-connected.yaml
index 3ed6db7a..6f235a81 100644
--- a/automated/android/wait-single-network-connected.yaml
+++ b/automated/android/wait-single-network-connected.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: wait-single-network-connected
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Wait until one locally attached Android device has a network IP address.
         Usable only if at most one device is visible to adb, but has the advantage that the device's
         serial number does not need to be known in advance."
diff --git a/automated/android/workload-automation/workload-automation.yaml b/automated/android/workload-automation/workload-automation.yaml
index f7062999..b64e908e 100644
--- a/automated/android/workload-automation/workload-automation.yaml
+++ b/automated/android/workload-automation/workload-automation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: workload-automation
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Workload Automation on Android"
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/android/workload-automation3/workload-automation.yaml b/automated/android/workload-automation3/workload-automation.yaml
index 9bbde230..2dbe0f2a 100644
--- a/automated/android/workload-automation3/workload-automation.yaml
+++ b/automated/android/workload-automation3/workload-automation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: workload-automation
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Workload Automation on Android"
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/linux/24h-stress-test/24h-stress-test.yaml b/automated/linux/24h-stress-test/24h-stress-test.yaml
index feb819eb..086d955e 100644
--- a/automated/linux/24h-stress-test/24h-stress-test.yaml
+++ b/automated/linux/24h-stress-test/24h-stress-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: 24h-stress-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run stress_ng, stress_oom and stress_network tests"
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/linux/android-platform-tools/install.yaml b/automated/linux/android-platform-tools/install.yaml
index 11cfd6d0..b68ad782 100644
--- a/automated/linux/android-platform-tools/install.yaml
+++ b/automated/linux/android-platform-tools/install.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: install-android-platform-tools
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Install android platform tools provided by Google from
                   https://developer.android.com/studio/releases/platform-tools"
     maintainer:
diff --git a/automated/linux/badblocks/badblocks.yaml b/automated/linux/badblocks/badblocks.yaml
index 99eec2f6..bdd38968 100644
--- a/automated/linux/badblocks/badblocks.yaml
+++ b/automated/linux/badblocks/badblocks.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: badblocks
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run a read-only test for bad blocks"
     maintainer:
         - ryan.harkin@linaro.org
diff --git a/automated/linux/blogbench/blogbench.yaml b/automated/linux/blogbench/blogbench.yaml
index bc10b6d3..54c679ff 100644
--- a/automated/linux/blogbench/blogbench.yaml
+++ b/automated/linux/blogbench/blogbench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: blogbench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Blogbench is a portable filesystem benchmark that tries to
                   reproduce the load of a real-world busy file server."
     maintainer:
diff --git a/automated/linux/chroot/kselftest_chroot.yaml b/automated/linux/chroot/kselftest_chroot.yaml
index f6874f0b..dbdaf74a 100644
--- a/automated/linux/chroot/kselftest_chroot.yaml
+++ b/automated/linux/chroot/kselftest_chroot.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kselftest-chroot
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run a chroot"
     maintainer:
         - anders.roxell@linaro.org
diff --git a/automated/linux/chroot/ltp_chroot.yaml b/automated/linux/chroot/ltp_chroot.yaml
index add97058..f3c04206 100644
--- a/automated/linux/chroot/ltp_chroot.yaml
+++ b/automated/linux/chroot/ltp_chroot.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ltp-chroot
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run a chroot"
     maintainer:
         - anders.roxell@linaro.org
diff --git a/automated/linux/cyclicdeadline/cyclicdeadline.yaml b/automated/linux/cyclicdeadline/cyclicdeadline.yaml
index 9f3c16b3..7259c4f7 100644
--- a/automated/linux/cyclicdeadline/cyclicdeadline.yaml
+++ b/automated/linux/cyclicdeadline/cyclicdeadline.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: cyclicdeadline
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "cyclicdeadline is a test that is similar to cyclictest
                   but instead of using SCHED_FIFO and nanosleep() to
                   measure jitter, it uses SCHED_DEADLINE and has the
diff --git a/automated/linux/cyclictest/cyclictest.yaml b/automated/linux/cyclictest/cyclictest.yaml
index 81e3dea0..613a963d 100644
--- a/automated/linux/cyclictest/cyclictest.yaml
+++ b/automated/linux/cyclictest/cyclictest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: cyclictest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "cyclictest measures event latency in Linux kernel by
                   measuring the amount of time that passes between when a timer
                   expires and when the thread which set the timer actually
diff --git a/automated/linux/dd-wr-speed/dd-wr-speed.yaml b/automated/linux/dd-wr-speed/dd-wr-speed.yaml
index 71132f72..1fc0d285 100644
--- a/automated/linux/dd-wr-speed/dd-wr-speed.yaml
+++ b/automated/linux/dd-wr-speed/dd-wr-speed.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: dd-speed-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "dd write/read speed test."
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/linux/device-tree/device-tree.yaml b/automated/linux/device-tree/device-tree.yaml
index 7c0a8ee0..c8637d09 100644
--- a/automated/linux/device-tree/device-tree.yaml
+++ b/automated/linux/device-tree/device-tree.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: device-tree
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Device tree test to check the folder structure. The test verifies that device-tree
                   is available and contains model name of the board."
     maintainer:
diff --git a/automated/linux/disk-partitioning/disk-partitioning.yaml b/automated/linux/disk-partitioning/disk-partitioning.yaml
index 9e72d95f..df559d3e 100644
--- a/automated/linux/disk-partitioning/disk-partitioning.yaml
+++ b/automated/linux/disk-partitioning/disk-partitioning.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: disk-partitioning-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Disk partitioning test."
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/linux/docker-integration-test/local-daemon.yaml b/automated/linux/docker-integration-test/local-daemon.yaml
index 08e5fb1e..a8e39b4e 100644
--- a/automated/linux/docker-integration-test/local-daemon.yaml
+++ b/automated/linux/docker-integration-test/local-daemon.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: local-daemon
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "docker-ce engine integration test for local daemon. Docker's tests are
                   designed to run inside docker container. This test case clones
                   docker-ce repo and checks out the released tag to test and then lunchs
diff --git a/automated/linux/docker/docker.yaml b/automated/linux/docker/docker.yaml
index 45c4fc53..96edfaa9 100644
--- a/automated/linux/docker/docker.yaml
+++ b/automated/linux/docker/docker.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: docker
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Docker smoke test. When docker not pre-installed,
                   docker-ce will be installed from upstream on supported
                   distributions."
diff --git a/automated/linux/dockerized-tests/local-run.yaml b/automated/linux/dockerized-tests/local-run.yaml
index 37153b98..d91ada59 100644
--- a/automated/linux/dockerized-tests/local-run.yaml
+++ b/automated/linux/dockerized-tests/local-run.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: local-run
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tests from https://git.linaro.org/qa/test-definitions.git with
                   docker. Test runs on test target."
     maintainer:
diff --git a/automated/linux/dockerized-tests/over-ssh.yaml b/automated/linux/dockerized-tests/over-ssh.yaml
index 729148ca..143bd6b6 100644
--- a/automated/linux/dockerized-tests/over-ssh.yaml
+++ b/automated/linux/dockerized-tests/over-ssh.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: over-ssh
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run tests from https://git.linaro.org/qa/test-definitions.git with
                   docker. Test run will be triggered over ssh"
     maintainer:
diff --git a/automated/linux/dsdbench/dsdbench.yaml b/automated/linux/dsdbench/dsdbench.yaml
index 57874810..a1c03269 100644
--- a/automated/linux/dsdbench/dsdbench.yaml
+++ b/automated/linux/dsdbench/dsdbench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: dsdbench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "dsdbench runs benchmarks and tests for storage driver
                   configurations to help figure out how the configuration will
                   perform and which known issues the daemon may be affected by
diff --git a/automated/linux/ethernet/ethernet.yaml b/automated/linux/ethernet/ethernet.yaml
index d2999a2d..f161a8c0 100644
--- a/automated/linux/ethernet/ethernet.yaml
+++ b/automated/linux/ethernet/ethernet.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ethernet
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "This test checks if Ethernet is up and prints IP address."
     maintainer:
         - naresh.kamboju@linaro.org
diff --git a/automated/linux/fio-test/fio-test.yaml b/automated/linux/fio-test/fio-test.yaml
index 950a329a..9a3cde68 100644
--- a/automated/linux/fio-test/fio-test.yaml
+++ b/automated/linux/fio-test/fio-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: fio-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "FIO or Flexible IO is a versatile IO workload generator test
                   on Linux."
     maintainer:
diff --git a/automated/linux/gpiod/gpiod.yaml b/automated/linux/gpiod/gpiod.yaml
index 1b8fb5bc..be8766af 100644
--- a/automated/linux/gpiod/gpiod.yaml
+++ b/automated/linux/gpiod/gpiod.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: gpiod
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run a gpiod suite"
     maintainer:
         - anders.roxell@linaro.org
diff --git a/automated/linux/httperf-client/httperf-client.yaml b/automated/linux/httperf-client/httperf-client.yaml
index f8519ec3..19e2d852 100644
--- a/automated/linux/httperf-client/httperf-client.yaml
+++ b/automated/linux/httperf-client/httperf-client.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: httperf-runner
-    format: Lava-Test-Shell Test Definition 1.0
+    format: Lava-Test Test Definition 1.0
     description: Run httperf against a web webserver to measure performance
     environment:
         - lava-test-shell
diff --git a/automated/linux/iozone/iozone.yaml b/automated/linux/iozone/iozone.yaml
index d03561f5..cb5f8bc7 100644
--- a/automated/linux/iozone/iozone.yaml
+++ b/automated/linux/iozone/iozone.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: iozone
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "IOzone is a filesystem benchmark tool. The benchmark generates and
                   measures a variety of file operations."
     maintainer:
diff --git a/automated/linux/iperf/iperf-client.yaml b/automated/linux/iperf/iperf-client.yaml
index 09b82db5..dfa866ff 100644
--- a/automated/linux/iperf/iperf-client.yaml
+++ b/automated/linux/iperf/iperf-client.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: iperf
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "iperf is a tool for active measurements of the maximum
                   achievable bandwidth on IP networks."
     maintainer:
diff --git a/automated/linux/iperf/iperf-server.yaml b/automated/linux/iperf/iperf-server.yaml
index 61869b29..f257066e 100644
--- a/automated/linux/iperf/iperf-server.yaml
+++ b/automated/linux/iperf/iperf-server.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: iperf
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "iperf is a tool for active measurements of the maximum
                   achievable bandwidth on IP networks."
     maintainer:
diff --git a/automated/linux/isolate-task/isolate-task.yaml b/automated/linux/isolate-task/isolate-task.yaml
index 2b428e01..41ed4c00 100644
--- a/automated/linux/isolate-task/isolate-task.yaml
+++ b/automated/linux/isolate-task/isolate-task.yaml
@@ -1,7 +1,7 @@
 metadata:
     name: verify_isolation
     version: "1.0"
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Verify kernel configuration. Isolate application and verify
                   that kernel tick/resch interrups do not occur more than 1/sec."
     maintainer:
diff --git a/automated/linux/kernel-compilation/kernel-compilation.yaml b/automated/linux/kernel-compilation/kernel-compilation.yaml
index 72da9185..f2c86569 100644
--- a/automated/linux/kernel-compilation/kernel-compilation.yaml
+++ b/automated/linux/kernel-compilation/kernel-compilation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kernel-compilation
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Compile kernel with defconfig on ARM64/ARM platform and
                   measure how long it takes."
     maintainer:
diff --git a/automated/linux/kernel-config-checker/kernel-config-checker.yaml b/automated/linux/kernel-config-checker/kernel-config-checker.yaml
index 41cfefcc..7f76e615 100644
--- a/automated/linux/kernel-config-checker/kernel-config-checker.yaml
+++ b/automated/linux/kernel-config-checker/kernel-config-checker.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kernel-config-checker
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Check the kernel config file for the presence of required
 		  CONFIG_* values."
     maintainer:
diff --git a/automated/linux/kselftest/kselftest.yaml b/automated/linux/kselftest/kselftest.yaml
index b8f172a6..e3a7189f 100644
--- a/automated/linux/kselftest/kselftest.yaml
+++ b/automated/linux/kselftest/kselftest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kselftest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Linux kernel self test"
     maintainer:
         - naresh.kamboju@linaro.org
diff --git a/automated/linux/kvm-unit-tests/kvm-unit-tests.yaml b/automated/linux/kvm-unit-tests/kvm-unit-tests.yaml
index d184295b..ccc0a530 100644
--- a/automated/linux/kvm-unit-tests/kvm-unit-tests.yaml
+++ b/automated/linux/kvm-unit-tests/kvm-unit-tests.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kvm-unit-tests
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Build and run kvm-unit-tests natively"
 
     maintainer:
diff --git a/automated/linux/kvm/start-kvm.yaml b/automated/linux/kvm/start-kvm.yaml
index 567c57cb..74f212ad 100644
--- a/automated/linux/kvm/start-kvm.yaml
+++ b/automated/linux/kvm/start-kvm.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: kvm
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Start KVM for secondary testing"
     maintainer:
         - riku.voipio@linaro.org
diff --git a/automated/linux/kvm/stop-guest.yaml b/automated/linux/kvm/stop-guest.yaml
index f04bf42a..75e56ef6 100644
--- a/automated/linux/kvm/stop-guest.yaml
+++ b/automated/linux/kvm/stop-guest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: guest-complete
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Signal tests inside guest complete and power off"
     maintainer:
         - riku.voipio@linaro.org
diff --git a/automated/linux/lapack/lapack.yaml b/automated/linux/lapack/lapack.yaml
index 70743d15..f9e943f0 100644
--- a/automated/linux/lapack/lapack.yaml
+++ b/automated/linux/lapack/lapack.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: lapack
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Build and run lapack (Linear Algebra PACKage) tests natively"
 
     maintainer:
diff --git a/automated/linux/libhugetlbfs/libhugetlbfs.yaml b/automated/linux/libhugetlbfs/libhugetlbfs.yaml
index 03779d03..95652862 100644
--- a/automated/linux/libhugetlbfs/libhugetlbfs.yaml
+++ b/automated/linux/libhugetlbfs/libhugetlbfs.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: libhugetlbfs
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Build and run libhugetlbfs tests.
                   Runs through $WORD_SIZE bit libhugetlbfs on target system.
                   The default WORD_SIZE is 64 bit to accomodate 64 bit systems
diff --git a/automated/linux/lshw/lshw.yaml b/automated/linux/lshw/lshw.yaml
index f63fc901..cbcc4b39 100644
--- a/automated/linux/lshw/lshw.yaml
+++ b/automated/linux/lshw/lshw.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: lshw
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "lshw is a small tool to extract detailed information
                   on the hardware configuration of the machine."
     maintainer:
diff --git a/automated/linux/ltp-open-posix/ltp-open-posix.yaml b/automated/linux/ltp-open-posix/ltp-open-posix.yaml
index da6f98db..141122a1 100644
--- a/automated/linux/ltp-open-posix/ltp-open-posix.yaml
+++ b/automated/linux/ltp-open-posix/ltp-open-posix.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ltp-open-posix
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run LTP open posix test suite"
     maintainer:
         - naresh.kamboju@linaro.org
diff --git a/automated/linux/ltp-realtime/ltp-realtime.yaml b/automated/linux/ltp-realtime/ltp-realtime.yaml
index f987b012..b7815a48 100644
--- a/automated/linux/ltp-realtime/ltp-realtime.yaml
+++ b/automated/linux/ltp-realtime/ltp-realtime.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ltp-realtime
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run LTP realtime test suite on Ubuntu/CentOS/Openembedded.
                   This testsuite contains some functional tests and a few
                   performance and latency measurement tests"
diff --git a/automated/linux/ltp/ltp.yaml b/automated/linux/ltp/ltp.yaml
index e2aa40e0..ee6b0c69 100644
--- a/automated/linux/ltp/ltp.yaml
+++ b/automated/linux/ltp/ltp.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ltp
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run LTP test suite on Ubuntu"
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/linux/meminfo/meminfo.yaml b/automated/linux/meminfo/meminfo.yaml
index 1b86678f..539819fe 100644
--- a/automated/linux/meminfo/meminfo.yaml
+++ b/automated/linux/meminfo/meminfo.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: meminfo
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Collect the information in /proc/meminfo after boot."
     maintainer:
         - ryan.harkin@linaro.org
diff --git a/automated/linux/nginx-server/nginx-linux.yaml b/automated/linux/nginx-server/nginx-linux.yaml
index c438c1cc..af63c8e0 100644
--- a/automated/linux/nginx-server/nginx-linux.yaml
+++ b/automated/linux/nginx-server/nginx-linux.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: httperf-nginx-linux-ip
-    format: Lava-Test-Shell Test Definition 1.0
+    format: Lava-Test Test Definition 1.0
     description: Server running plain NGiNX, no acceleration
     environment:
         - lava-test-shell
diff --git a/automated/linux/nginx-server/nginx-odp-dpdk-git.yaml b/automated/linux/nginx-server/nginx-odp-dpdk-git.yaml
index acf3e37c..3d4c49b1 100644
--- a/automated/linux/nginx-server/nginx-odp-dpdk-git.yaml
+++ b/automated/linux/nginx-server/nginx-odp-dpdk-git.yaml
@@ -1,7 +1,7 @@
 # NOTE: when calling this test, kernel-headers must have been installed
 metadata:
     name: httperf-nginx-ofp-odp-dpdk-git
-    format: Lava-Test-Shell Test Definition 1.0
+    format: Lava-Test Test Definition 1.0
     description: Server running OFP+ODP+DPDK NGiNX from git
     environment:
         - lava-test-shell
diff --git a/automated/linux/nginx-server/nginx-odp-dpdk.yaml b/automated/linux/nginx-server/nginx-odp-dpdk.yaml
index 749bde50..e299dfb6 100644
--- a/automated/linux/nginx-server/nginx-odp-dpdk.yaml
+++ b/automated/linux/nginx-server/nginx-odp-dpdk.yaml
@@ -1,7 +1,7 @@
 # NOTE: when calling this test, kernel-headers must have been installed
 metadata:
     name: httperf-nginx-ofp-odp-dpdk
-    format: Lava-Test-Shell Test Definition 1.0
+    format: Lava-Test Test Definition 1.0
     description: Server running OFP+ODP+DPDK NGiNX
     environment:
         - lava-test-shell
diff --git a/automated/linux/openssh/openssh-debian.yaml b/automated/linux/openssh/openssh-debian.yaml
index ea77da99..0670318d 100644
--- a/automated/linux/openssh/openssh-debian.yaml
+++ b/automated/linux/openssh/openssh-debian.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: openssh-debian
-    format: "Manual Test Definition 1.0"
+    format: Lava-Test Test Definition 1.0
     description: "Normal OpenSSH development produces a very small, secure,
         and easy to maintain version for the OpenBSD project.
         The OpenSSH Portability Team takes that pure version and adds
diff --git a/automated/linux/optee/optee-xtest-qemu.yaml b/automated/linux/optee/optee-xtest-qemu.yaml
index 32dfa9b8..3f3fd716 100644
--- a/automated/linux/optee/optee-xtest-qemu.yaml
+++ b/automated/linux/optee/optee-xtest-qemu.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: optee-xtest-qemu
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "OP-TEE sanity test suite using QEMU"
     maintainer:
         - fathi.boudra@linaro.org
diff --git a/automated/linux/optee/optee-xtest.yaml b/automated/linux/optee/optee-xtest.yaml
index 06415b3b..f461b32b 100644
--- a/automated/linux/optee/optee-xtest.yaml
+++ b/automated/linux/optee/optee-xtest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: optee-xtest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "OP-TEE sanity test suite"
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/linux/ota-update/ota-update.yaml b/automated/linux/ota-update/ota-update.yaml
index d5b8b22c..1502fe41 100644
--- a/automated/linux/ota-update/ota-update.yaml
+++ b/automated/linux/ota-update/ota-update.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ota-update
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Tests OTA update on device"
     maintainer:
         - vishal.bhoj@linaro.org
diff --git a/automated/linux/overlayfs/overlayfs.yaml b/automated/linux/overlayfs/overlayfs.yaml
index f3d89189..1d728faf 100644
--- a/automated/linux/overlayfs/overlayfs.yaml
+++ b/automated/linux/overlayfs/overlayfs.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: overlayfs
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run overlay filesystem test from unionmount testsuite. Kernel config
                   CONFIG_OVERLAY_FS=y is required for this test."
     maintainer:
diff --git a/automated/linux/perf/perf.yaml b/automated/linux/perf/perf.yaml
index f578a8f4..c812242c 100644
--- a/automated/linux/perf/perf.yaml
+++ b/automated/linux/perf/perf.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: perf
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Perf is a profiler tool for Linux and is used to collect and analyze performance and trace data.
                   This test runs following perf commands: record(record events for later reporting), report(break
                   down events by process, function, etc), stat(obtain event counts) and test(Run sanity tests)."
diff --git a/automated/linux/pm-qa/pm-qa.yaml b/automated/linux/pm-qa/pm-qa.yaml
index 1c7847c0..70e6e142 100644
--- a/automated/linux/pm-qa/pm-qa.yaml
+++ b/automated/linux/pm-qa/pm-qa.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pm-qa
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Test power management (PM-QA). Currently, the test runs
                   cpufreq, cpuidle, cpuhotplug, thermal and cputopology by
                   default and individual test can be run by setting TESTS
diff --git a/automated/linux/pmqtest/pmqtest.yaml b/automated/linux/pmqtest/pmqtest.yaml
index 64987139..d75cf13a 100644
--- a/automated/linux/pmqtest/pmqtest.yaml
+++ b/automated/linux/pmqtest/pmqtest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pmqtest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Pmqtest measures the latency of interprocess communication
                   with POSIX messages queues. The test starts pairs of threads
                   that are synchronized via mq_send/mw_receive() and measures
diff --git a/automated/linux/pointer-tagging/pointer-tagging-tests.yaml b/automated/linux/pointer-tagging/pointer-tagging-tests.yaml
index 62435a73..07641c10 100644
--- a/automated/linux/pointer-tagging/pointer-tagging-tests.yaml
+++ b/automated/linux/pointer-tagging/pointer-tagging-tests.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pointer-tagging-tests
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "This test suite is designed to verify that the AArch64
             tagged-addressing feature is properly supported. Tagged addressing
             is guaranteed to be available in the ARMv8 architecture"
diff --git a/automated/linux/pritee_test_utility/pritee_test_utility.yaml b/automated/linux/pritee_test_utility/pritee_test_utility.yaml
index 2c7cfaec..239a05d1 100644
--- a/automated/linux/pritee_test_utility/pritee_test_utility.yaml
+++ b/automated/linux/pritee_test_utility/pritee_test_utility.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pritee_test_utility
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "PlayReady Interface for Trusted Execution Environment Test Utility"
     maintainer:
         - arthur.she@linaro.org
diff --git a/automated/linux/ptsematest/ptsematest.yaml b/automated/linux/ptsematest/ptsematest.yaml
index dfa8a2c3..c22f70be 100644
--- a/automated/linux/ptsematest/ptsematest.yaml
+++ b/automated/linux/ptsematest/ptsematest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: pmsematest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "ptsematest starts threads that are synchronized via
         pthread_mutex_unlock()/pthread_mutex_lock() and measures the latency
         between releasing and getting the lock."
diff --git a/automated/linux/rcutorture/rcutorture.yaml b/automated/linux/rcutorture/rcutorture.yaml
index a4729816..51ab0ac0 100644
--- a/automated/linux/rcutorture/rcutorture.yaml
+++ b/automated/linux/rcutorture/rcutorture.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: rcutorture
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "RCU or Read-Copy Update Torture test for Linux Kernel. Kernel
                   config required for this test CONFIG_RCU_TORTURE_TEST=m"
     maintainer:
diff --git a/automated/linux/rt-migrate-test/rt-migrate-test.yaml b/automated/linux/rt-migrate-test/rt-migrate-test.yaml
index f6713f28..715ac6cb 100644
--- a/automated/linux/rt-migrate-test/rt-migrate-test.yaml
+++ b/automated/linux/rt-migrate-test/rt-migrate-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: rt-migrate-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "rt-migrate-test verifies the RT threads scheduler balancing."
     maintainer:
         - chase.qi@linaro.org
diff --git a/automated/linux/signaltest/signaltest.yaml b/automated/linux/signaltest/signaltest.yaml
index 29aa7a3b..06b1205e 100644
--- a/automated/linux/signaltest/signaltest.yaml
+++ b/automated/linux/signaltest/signaltest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: signaltest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "signaltest is a RT signal roundtrip test software."
 
     maintainer:
diff --git a/automated/linux/sigwaittest/sigwaittest.yaml b/automated/linux/sigwaittest/sigwaittest.yaml
index 62edc3dc..4074f63b 100644
--- a/automated/linux/sigwaittest/sigwaittest.yaml
+++ b/automated/linux/sigwaittest/sigwaittest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: sigwaittest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "sigwaittest starts two threads or, optionally, forks
                   two processes that are synchronized via signals and
                   measures the latency between sending a signal and
diff --git a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
index c2118738..77b81fc0 100644
--- a/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
+++ b/automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: spectre-meltdown-checker
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Run spectre meltdown checker"
     maintainer:
         - naresh.kamboju@linaro.org
diff --git a/automated/linux/svsematest/svsematest.yaml b/automated/linux/svsematest/svsematest.yaml
index 7724656f..10b17c60 100644
--- a/automated/linux/svsematest/svsematest.yaml
+++ b/automated/linux/svsematest/svsematest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: svsematest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "svsematest starts two threads or, optionally, forks
                   two processes that are synchronized via SYSV semaphores
                   and measures the latency between releasing a semaphore
diff --git a/automated/linux/sysbench/sysbench.yaml b/automated/linux/sysbench/sysbench.yaml
index b156615e..1edd0a41 100644
--- a/automated/linux/sysbench/sysbench.yaml
+++ b/automated/linux/sysbench/sysbench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: sysbench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "SysBench is a modular, cross-platform and multi-threaded
                   benchmark tool for evaluating OS parameters that are
                   important for a system running a database under intensive
diff --git a/automated/linux/sysfs-bus-iio-smoke/sysfs-bus-iio-smoke.yaml b/automated/linux/sysfs-bus-iio-smoke/sysfs-bus-iio-smoke.yaml
index 527d45e7..d9ed972f 100644
--- a/automated/linux/sysfs-bus-iio-smoke/sysfs-bus-iio-smoke.yaml
+++ b/automated/linux/sysfs-bus-iio-smoke/sysfs-bus-iio-smoke.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: sysfs-bus-iio-smoke
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Range checks for particular properties in the sysfs bus iio subsystem."
     maintainer:
         - luis.machado@linaro.org
diff --git a/automated/linux/toolchain-smoke/toolchain-smoke.yaml b/automated/linux/toolchain-smoke/toolchain-smoke.yaml
index a9d64818..aadcc9e1 100644
--- a/automated/linux/toolchain-smoke/toolchain-smoke.yaml
+++ b/automated/linux/toolchain-smoke/toolchain-smoke.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: toolchain-smoke
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Simple test that checks whether gcc compilation works"
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/linux/ui-browser-test/ui-browser-test.yaml b/automated/linux/ui-browser-test/ui-browser-test.yaml
index 980ba3d8..a9403247 100644
--- a/automated/linux/ui-browser-test/ui-browser-test.yaml
+++ b/automated/linux/ui-browser-test/ui-browser-test.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: ui-browser-test
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "ui browser tests by using robot frame work
                   Test runs chromium, chrome and firefox browser test cases."
     maintainer:
diff --git a/automated/linux/unixbench/unixbench.yaml b/automated/linux/unixbench/unixbench.yaml
index a5acdd4d..6575e16f 100644
--- a/automated/linux/unixbench/unixbench.yaml
+++ b/automated/linux/unixbench/unixbench.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: unixbench
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "The purpose of UnixBench is to provide a basic
                   indicator of the performance of a Unix-like system."
     maintainer:
diff --git a/automated/linux/v4l2/v4l2-compliance.yaml b/automated/linux/v4l2/v4l2-compliance.yaml
index cf013346..303d524b 100644
--- a/automated/linux/v4l2/v4l2-compliance.yaml
+++ b/automated/linux/v4l2/v4l2-compliance.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: v4l2-compliance
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "v4l2 Compliance test suite"
     maintainer:
         - ryan.harkin@linaro.org
diff --git a/automated/linux/widevine/widevine_unittest.yaml b/automated/linux/widevine/widevine_unittest.yaml
index 99a26fd0..966d508d 100644
--- a/automated/linux/widevine/widevine_unittest.yaml
+++ b/automated/linux/widevine/widevine_unittest.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: widevine_unittest
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Widevine Content Decryption Modules (CDMs) are how streaming services
                   protect content using HTML5 video to web browsers without relying on
                   an NPAPI plugin like Flash or Silverlight. This test runs widevine_ce_cdm_unittest"
diff --git a/automated/linux/workload-automation/workload-automation.yaml b/automated/linux/workload-automation/workload-automation.yaml
index 9bc34a5f..f4e4f8fa 100644
--- a/automated/linux/workload-automation/workload-automation.yaml
+++ b/automated/linux/workload-automation/workload-automation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: workload-automation-linux
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Workload Automation on Linux"
     maintainer:
         - milosz.wasilewski@linaro.org
diff --git a/automated/linux/workload-automation3/workload-automation.yaml b/automated/linux/workload-automation3/workload-automation.yaml
index a82a3783..fc6872dc 100644
--- a/automated/linux/workload-automation3/workload-automation.yaml
+++ b/automated/linux/workload-automation3/workload-automation.yaml
@@ -1,6 +1,6 @@
 metadata:
     name: workload-automation-linux
-    format: "Lava-Test-Shell Test Definition 1.0"
+    format: "Lava-Test Test Definition 1.0"
     description: "Workload Automation on Linux"
     maintainer:
         - milosz.wasilewski@linaro.org