providers:checkbox: sed -e 's/name: /id: /' -i *.txt.in

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com> 

48 files changed, 701 insertions, 702 deletions

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index 4b54c18..da7830f 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: audio/list_devices
+id: audio/list_devices
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
@@ -8,7 +8,7 @@ command: cat /proc/asound/cards
 _description: Test to detect audio devices
 
 plugin: user-interact-verify
-name: audio/playback_auto
+id: audio/playback_auto
 estimated_duration: 5.0
 depends: audio/list_devices
 requires:
@@ -28,7 +28,7 @@ _description:
 Did you hear a tone?
 
 plugin: user-interact-verify
-name: audio/playback_hdmi
+id: audio/playback_hdmi
 estimated_duration: 30.0
 requires:
 device.category == 'AUDIO'
@@ -47,7 +47,7 @@ _description:
 Did you hear the sound from the HDMI device?
 
 plugin: user-interact-verify
-name: audio/playback_displayport
+id: audio/playback_displayport
 estimated_duration: 30.0
 requires:
 device.category == 'AUDIO'
@@ -66,7 +66,7 @@ _description:
 Did you hear the sound from the DisplayPort device?
 
 plugin: user-interact-verify
-name: audio/playback_headphones
+id: audio/playback_headphones
 estimated_duration: 20.0
 depends: audio/list_devices
 requires:
@@ -85,7 +85,7 @@ _description:
 Did you hear a sound through the headphones and did the sound play without any distortion, clicks or other strange noises from your headphones?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_internal
+id: audio/alsa_record_playback_internal
 estimated_duration: 20.0
 depends: audio/playback_auto
 requires:
@@ -105,7 +105,7 @@ _description:
 Did you hear your speech played back?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_external
+id: audio/alsa_record_playback_external
 estimated_duration: 20.0
 depends: audio/playback_headphones
 requires:
@@ -125,7 +125,7 @@ _description:
 Did you hear your speech played back?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_usb
+id: audio/alsa_record_playback_usb
 estimated_duration: 120.0
 requires:
 device.category == 'AUDIO'
@@ -144,7 +144,7 @@ _description:
 Did you hear your speech played back through the USB headphones?
 
 plugin: shell
-name: audio/alsa_record_playback_automated
+id: audio/alsa_record_playback_automated
 estimated_duration: 10.0
 requires:
 package.name == 'python3-gi'
@@ -160,7 +160,7 @@ _description:
 default input.
 
 plugin: shell
-name: audio/alsa_info_collect
+id: audio/alsa_info_collect
 estimated_duration: 2.0
 command: alsa_info --no-dialog --no-upload --output ${CHECKBOX_DATA}/alsa_info.log
 _description:
@@ -169,7 +169,7 @@ _description:
 under a controlled environment.
 
 plugin: attachment
-name: audio/alsa_info_attachment
+id: audio/alsa_info_attachment
 depends: audio/alsa_info_collect
 estimated_duration: 1.0
 command: [ -e ${CHECKBOX_DATA}/alsa_info.log ] && cat ${CHECKBOX_DATA}/alsa_info.log
@@ -177,7 +177,7 @@ _description:
 Attaches the audio hardware data collection log to the results.
 
 plugin: user-interact-verify
-name: audio/channels
+id: audio/channels
 estimated_duration: 20.0
 command: speaker-test -c 2 -l 1 -t wav
 _description:
@@ -189,7 +189,7 @@ _description:
 You should clearly hear a voice from the different audio channels
 
 plugin: shell
-name: audio/check_volume
+id: audio/check_volume
 estimated_duration: 1.0
 requires:
 package.name == 'pulseaudio-utils'
@@ -204,7 +204,7 @@ _description:
 volume or mute before running this test.
 
 plugin: manual
-name: audio/external-lineout
+id: audio/external-lineout
 estimated_duration: 30.0
 _description:
 PURPOSE:
@@ -218,7 +218,7 @@ _description:
 2. Do you hear the sound coming out on the corresponding channel?
 
 plugin: user-interact-verify
-name: audio/external-linein
+id: audio/external-linein
 estimated_duration: 120.0
 requires:
 device.category == 'AUDIO'
@@ -237,7 +237,7 @@ _description:
 Did you hear your recording?
 
 plugin: user-interact
-name: audio/speaker-headphone-plug-detection
+id: audio/speaker-headphone-plug-detection
 estimated_duration: 60.0
 requires:
 device.category == 'AUDIO'
@@ -257,7 +257,7 @@ _description:
 The test times out after 30 seconds (and fails in that case).
 
 plugin: user-interact
-name: audio/microphone-plug-detection
+id: audio/microphone-plug-detection
 estimated_duration: 60.0
 requires:
 device.category == 'AUDIO'
@@ -278,7 +278,7 @@ _description:
 The test times out after 30 seconds (and fails in that case).
 
 plugin: user-interact-verify
-name: audio/balance_internal_speaker
+id: audio/balance_internal_speaker
 estimated_duration: 20.0
 depends: audio/playback_auto
 requires:
@@ -299,7 +299,7 @@ _description:
 Does the slider move smoothly, as well as being followed by the setting by the actual audio output?
 
 plugin: user-interact-verify
-name: audio/balance_headphones
+id: audio/balance_headphones
 depends: audio/playback_headphones
 estimated_duration: 30.0
 requires:
@@ -320,7 +320,7 @@ _description:
 Does the slider move smoothly, as well as being followed by the setting by the actual audio output?
 
 plugin: shell
-name: audio/list_devices_after_suspend_30_cycles
+id: audio/list_devices_after_suspend_30_cycles
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
 requires:
@@ -330,7 +330,7 @@ command: cat /proc/asound/cards
 _description: Test to detect audio devices after suspending 30 times.
 
 plugin: user-interact-verify
-name: audio/playback_auto_after_suspend_30_cycles
+id: audio/playback_auto_after_suspend_30_cycles
 estimated_duration: 5.0
 depends: audio/list_devices power-management/suspend_30_cycles
 requires:
@@ -350,7 +350,7 @@ _description:
 Did you hear a tone?
 
 plugin: shell
-name: audio/alsa_record_playback_automated_after_suspend_30_cycles
+id: audio/alsa_record_playback_automated_after_suspend_30_cycles
 estimated_duration: 10.0
 depends: power-management/suspend_30_cycles
 requires:
@@ -367,7 +367,7 @@ _description:
 default input, after suspending 30 times.
 
 plugin: shell
-name: audio/check_volume_after_suspend_30_cycles
+id: audio/check_volume_after_suspend_30_cycles
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
 requires:
@@ -383,7 +383,7 @@ _description:
 volume or mute before running this test.
 
 plugin: shell
-name: audio/audio_after_suspend_30_cycles
+id: audio/audio_after_suspend_30_cycles
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
 requires:
diff --git a/jobs/benchmarks.txt.in b/jobs/benchmarks.txt.in
index 7a46724..efc19db 100644
--- a/jobs/benchmarks.txt.in
+++ b/jobs/benchmarks.txt.in
@@ -1,11 +1,11 @@
 plugin: local
-name: benchmarks/disk/hdparm-read
+id: benchmarks/disk/hdparm-read
 requires: device.category == 'DISK'
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: benchmarks/disk/hdparm-read_`ls /sys$path/block`
+ id: benchmarks/disk/hdparm-read_`ls /sys$path/block`
 requires: device.path == "$path"
 user: root
 command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -13,13 +13,13 @@ command:
 EOF
 
 plugin: local
-name: benchmarks/disk/hdparm-cache-read
+id: benchmarks/disk/hdparm-cache-read
 requires: device.category == 'DISK'
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
+ id: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
 requires: device.path == "$path"
 user: root
 command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -27,7 +27,7 @@ command:
 EOF
 
 plugin: shell
-name: benchmarks/graphics/gtkperf
+id: benchmarks/graphics/gtkperf
 depends: graphics/xorg-version
 requires: package.name == 'gtkperf'
 command: python3 -c 'import re,sys,subprocess; (s, o) = subprocess.getstatusoutput("gtkperf -a"); [sys.exit(1) for i in [s] if s]; m = re.search("Total time:\s+(.*)\n", o); [print(i.group(1)+" Seconds") for i in [m] if m]'
@@ -36,42 +36,42 @@ _description:
 Run gtkperf to make sure that GTK based test cases work
 
 plugin: shell
-name: benchmarks/graphics/render-bench
+id: benchmarks/graphics/render-bench
 requires: package.name == 'render-bench'
 command: /usr/bin/time -f "%e Seconds" render_bench 2>&1 >/dev/null
 estimated_duration: 52.000
 _description: Run Render-Bench XRender/Imlib2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-Xrender-gearsfancy
+id: benchmarks/graphics/qgears2-Xrender-gearsfancy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=0" pts_run qgears2
 estimated_duration: 180.000
 _description: Run Qgears2 XRender Extension gearsfancy benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-Xrender-compo
+id: benchmarks/graphics/qgears2-Xrender-compo
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=2" pts_run qgears2
 estimated_duration: 31.500
 _description: Run Qgears2 XRender Extension image scaling benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-gl-gearsfancy
+id: benchmarks/graphics/qgears2-gl-gearsfancy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=0" pts_run qgears2
 estimated_duration: 52.000
 _description: Run Qgears2 OpenGL gearsfancy benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-gl-compo
+id: benchmarks/graphics/qgears2-gl-compo
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=2" pts_run qgears2
 estimated_duration: 23.000
 _description: Run Qgears2 OpenGL image scaling benchmark
 
 plugin: shell
-name: benchmarks/graphics/glmark2-es2
+id: benchmarks/graphics/glmark2-es2
 requires:
 package.name == 'glmark2-es2'
 'arm' in cpuinfo.type
@@ -80,7 +80,7 @@ command:
 _description: Run GLmark2-ES2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/glmark2
+id: benchmarks/graphics/glmark2
 requires:
 package.name == 'glmark2'
 cpuinfo.platform in ("i386", "x86_64")
@@ -90,7 +90,7 @@ estimated_duration: 306.000
 _description: Run GLmark2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/globs
+id: benchmarks/graphics/globs
 requires:
 package.name == 'globs'
 cpuinfo.platform in ("i386", "x86_64")
@@ -99,140 +99,140 @@ estimated_duration: 53.500
 _description: Run globs benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-sanctuary
+id: benchmarks/graphics/unigine-sanctuary
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-sanctuary
 _description: Run Unigine Santuary benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-tropics
+id: benchmarks/graphics/unigine-tropics
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-tropics
 _description: Run Unigine Tropics benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-heaven
+id: benchmarks/graphics/unigine-heaven
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-heaven
 _description: Run Unigine Heaven benchmark
 
 plugin: shell
-name: benchmarks/graphics/lightsmark
+id: benchmarks/graphics/lightsmark
 requires: package.name == 'phoronix-test-suite'
 command: pts_run lightsmark
 _description: Run Lightsmark benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-read
+id: benchmarks/memory/cachebench-read
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=0" pts_run cachebench
 _description: Run Cachebench Read benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-write
+id: benchmarks/memory/cachebench-write
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=1" pts_run cachebench
 _description: Run Cachebench Write benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-read-modify-write
+id: benchmarks/memory/cachebench-read-modify-write
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=2" pts_run cachebench
 _description: Run Cachebench Read / Modify / Write benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-copy
+id: benchmarks/memory/stream-copy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=0" pts_run stream
 _description: Run Stream Copy benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-scale
+id: benchmarks/memory/stream-scale
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=1" pts_run stream
 _description: Run Stream Scale benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-add
+id: benchmarks/memory/stream-add
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=2" pts_run stream
 _description: Run Stream Add benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-triad
+id: benchmarks/memory/stream-triad
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=3" pts_run stream
 _description: Run Stream Triad benchmark
 
 plugin: shell
-name: benchmarks/network/network-loopback
+id: benchmarks/network/network-loopback
 requires: package.name == 'phoronix-test-suite'
 command: pts_run network-loopback
 estimated_duration: 85.0
 _description: Run Network Loopback benchmark
 
 plugin: shell
-name: benchmarks/network/wifi_time_to_reconnect
+id: benchmarks/network/wifi_time_to_reconnect
 requires: device.category == 'WIRELESS'
 command: wifi_time2reconnect
 _description: Check the time needed to reconnect to a WIFI access point
 
 plugin: shell
-name: benchmarks/processor/encode-mp3
+id: benchmarks/processor/encode-mp3
 requires: package.name == 'phoronix-test-suite'
 command: pts_run encode-mp3
 _description: Run Encode MP3 benchmark
 
 plugin: shell
-name: benchmarks/processor/x264
+id: benchmarks/processor/x264
 requires: package.name == 'phoronix-test-suite'
 command: pts_run x264
 _description: Run x264 H.264/AVC encoder benchmark
 
 plugin: shell
-name: benchmarks/processor/gnupg
+id: benchmarks/processor/gnupg
 requires: package.name == 'phoronix-test-suite'
 command: pts_run gnupg
 _description: Run GnuPG benchmark
 
 plugin: shell
-name: benchmarks/processor/compress-pbzip2
+id: benchmarks/processor/compress-pbzip2
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-pbzip2
 _description: Run Compress PBZIP2 benchmark
 
 plugin: shell
-name: benchmarks/processor/compress-7zip
+id: benchmarks/processor/compress-7zip
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-7zip
 _description: Run Compress 7ZIP benchmark
 
 plugin: shell
-name: benchmarks/processor/n-queens
+id: benchmarks/processor/n-queens
 requires: package.name == 'phoronix-test-suite'
 command: pts_run n-queens
 _description: Run N-Queens benchmark
 
 plugin: shell
-name: benchmarks/processor/himeno
+id: benchmarks/processor/himeno
 requires: package.name == 'phoronix-test-suite'
 command: pts_run himeno
 _description: Run Himeno benchmark
 
 plugin: shell
-name: benchmarks/system/cpu_on_idle
+id: benchmarks/system/cpu_on_idle
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("idle\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: CPU utilization on an idle system.
 
 plugin: shell
-name: benchmarks/system/disk_on_idle
+id: benchmarks/system/disk_on_idle
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("util\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: Disk utilization on an idle system.
 
 plugin: shell
-name: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -243,7 +243,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_furmark_windowed_1024x640
+id: benchmarks/graphics/gputest_furmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -254,7 +254,7 @@ _description:
 Windowed 1024x640 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -265,7 +265,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_gimark_windowed_1024x640
+id: benchmarks/graphics/gputest_gimark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -276,7 +276,7 @@ _description:
 Windowed 1024x640 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -287,7 +287,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_tessmark_windowed_1024x640
+id: benchmarks/graphics/gputest_tessmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
diff --git a/jobs/bluetooth.txt.in b/jobs/bluetooth.txt.in
index 6244c4b..1aec4f3 100644
--- a/jobs/bluetooth.txt.in
+++ b/jobs/bluetooth.txt.in
@@ -1,6 +1,6 @@
 
 plugin: shell
-name: bluetooth/detect-output
+id: bluetooth/detect-output
 estimated_duration: 1.2
 requires:
 package.name == 'bluez'
@@ -24,7 +24,7 @@ _description:
 Automated test to store bluetooth device information in checkbox report
 
 plugin: manual
-name: bluetooth/browse-files
+id: bluetooth/browse-files
 depends: bluetooth/detect-output
 estimated_duration: 120.0
 _description:
@@ -44,7 +44,7 @@ _description:
 Did all the steps work?
 
 plugin: manual
-name: bluetooth/file-transfer
+id: bluetooth/file-transfer
 depends: bluetooth/browse-files bluetooth/detect-output
 estimated_duration: 120.0
 _description:
@@ -58,7 +58,7 @@ _description:
 Were all files copied correctly?
 
 plugin: user-interact-verify
-name: bluetooth/audio-a2dp
+id: bluetooth/audio-a2dp
 depends: bluetooth/detect-output
 estimated_duration: 120.0
 command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
@@ -76,7 +76,7 @@ _description:
 Did you hear the sound?
 
 plugin: user-interact-verify
-name: bluetooth/audio
+id: bluetooth/audio
 depends: bluetooth/detect-output
 estimated_duration: 120.0
 command: arecord -d 5 -D bluetooth -f S16_LE | aplay -D bluetooth -f S16_LE
@@ -98,7 +98,7 @@ _description:
 Did you hear the sound you recorded in the bluetooth
 
 plugin: user-interact-verify
-name: bluetooth/HID
+id: bluetooth/HID
 depends: bluetooth/detect-output
 estimated_duration: 120.0
 command: keyboard_test
diff --git a/jobs/camera.txt.in b/jobs/camera.txt.in
index 68a69e9..3ba4c8c 100644
--- a/jobs/camera.txt.in
+++ b/jobs/camera.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: camera/detect
+id: camera/detect
 estimated_duration: 1.2
 requires:
 device.category == 'CAPTURE'
@@ -7,7 +7,7 @@ command: camera_test detect
 _description: This Automated test attempts to detect a camera.
 
 plugin: user-verify
-name: camera/display
+id: camera/display
 estimated_duration: 120.0
 depends: camera/detect
 requires:
@@ -22,7 +22,7 @@ _description:
 Did you see the video capture?
 
 plugin: user-verify
-name: camera/still
+id: camera/still
 estimated_duration: 120.0
 depends: camera/detect
 requires:
@@ -40,7 +40,7 @@ _description:
 Did you see the image?
 
 plugin: shell
-name: camera/multiple-resolution-images
+id: camera/multiple-resolution-images
 estimated_duration: 1.2
 depends: camera/detect
 requires:
diff --git a/jobs/codecs.txt.in b/jobs/codecs.txt.in
index b44a379..694c781 100644
--- a/jobs/codecs.txt.in
+++ b/jobs/codecs.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact-verify
-name: codecs/ogg-vorbis
+id: codecs/ogg-vorbis
 requires:
 package.name == 'gstreamer0.10-plugins-base' or package.name == 'gstreamer1.0-plugins-base'
 package.name == 'totem'
@@ -15,7 +15,7 @@ _description:
 Did the sample play correctly?
 
 plugin: user-interact-verify
-name: codecs/wav
+id: codecs/wav
 requires:
 package.name == 'gstreamer0.10-plugins-good' or package.name == 'gstreamer1.0-plugins-good'
 package.name == 'totem'
diff --git a/jobs/cpu.txt.in b/jobs/cpu.txt.in
index ea2d5cc..f2d6c90 100644
--- a/jobs/cpu.txt.in
+++ b/jobs/cpu.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: cpu/scaling_test
+id: cpu/scaling_test
 requires:
 package.name == 'fwts'
 user: root
@@ -9,58 +9,57 @@ _description:
 Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
 
 plugin: attachment
-name: cpu/scaling_test-log-attach
+id: cpu/scaling_test-log-attach
 depends: cpu/scaling_test
 command: [[ -e ${CHECKBOX_DATA}/scaling_test.log ]] && cat ${CHECKBOX_DATA}/scaling_test.log
 _description:
 Attaches the log generated by cpu/scaling_test to the results
 
 plugin: shell
-name: cpu/maxfreq_test
+id: cpu/maxfreq_test
 requires:
 package.name == 'fwts'
 user: root
-environ: CHECKBOX_DATA
-command: fwts_test -t maxfreq -l ${CHECKBOX_DATA}/maxfreq_test.log
+command: fwts_test -t maxfreq -l $PLAINBOX_SESSION_SHARE/maxfreq_test.log
 _description:
 Test that the CPU can run at its max frequency using Firmware Test Suite (fwts cpufreq).
 
 plugin: attachment
-name: cpu/maxfreq_test-log-attach
+id: cpu/maxfreq_test-log-attach
 depends: cpu/maxfreq_test
-command: [[ -e ${CHECKBOX_DATA}/maxfreq_test.log ]] && cat ${CHECKBOX_DATA}/maxfreq_test.log
+command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && cat $PLAINBOX_SESSION_SHARE/maxfreq_test.log
 _description:
 Attaches the log generated by cpu/maxfreq_test to the results
 
 plugin: shell
-name: cpu/clocktest
+id: cpu/clocktest
 command: clocktest
 _description:
 Test for clock jitter.
 
 plugin: shell
-name: cpu/offlining_test
+id: cpu/offlining_test
 user: root
 command: cpu_offlining
 _description:
 Test offlining CPUs in a multicore system.
 
 plugin: shell
-name: cpu/topology
+id: cpu/topology
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64')
 command: cpu_topology
 _description:
 This test checks cpu topology for accuracy
 
 plugin: shell
-name: cpu/frequency_governors
+id: cpu/frequency_governors
 user: root
 command: nice -n -20 frequency_governors_test --debug
 _description:
 This test checks that CPU frequency governors are obeyed when set.
 
 plugin: shell
-name: cpu/arm_vfp_support
+id: cpu/arm_vfp_support
 requires: 'arm' in cpuinfo.type
 command: grep VFP /var/log/syslog
 _description:
diff --git a/jobs/daemons.txt.in b/jobs/daemons.txt.in
index ad0abf3..69a76f5 100644
--- a/jobs/daemons.txt.in
+++ b/jobs/daemons.txt.in
@@ -1,66 +1,66 @@
 plugin: shell
-name: daemons/atd
+id: daemons/atd
 requires: package.name == 'at'
 command: pgrep -f '/usr/sbin/atd' >/dev/null
 _description: Test if the atd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/cron
+id: daemons/cron
 requires: package.name == 'cron'
 command: pgrep -f '/usr/sbin/cron' >/dev/null
 _description: Test if the cron daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/cupsd
+id: daemons/cupsd
 requires: package.name == 'cupsys'
 command: pgrep -f '/usr/sbin/cupsd' >/dev/null
 _description: Test if the cupsd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/getty
+id: daemons/getty
 requires: package.name == 'util-linux'
 command: pgrep -f '/sbin/getty' >/dev/null
 _description: Test if the getty daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/init
+id: daemons/init
 requires: package.name == 'upstart'
 command: pgrep -f '/sbin/init' >/dev/null
 _description: Test if the init daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/klogd
+id: daemons/klogd
 requires: package.name == 'klogd'
 command: pgrep -f '/sbin/klogd' >/dev/null
 _description: Test if the klogd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/nmbd
+id: daemons/nmbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/nmbd' >/dev/null
 _description: Test if the nmbd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/smbd
+id: daemons/smbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/smbd' >/dev/null
 _description: Test if the smbd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/syslogd
+id: daemons/syslogd
 requires: package.name == 'syslogd'
 command: pgrep -f '/sbin/syslogd' >/dev/null
 _description: Test if the syslogd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/udevd
+id: daemons/udevd
 requires:
 package.name == 'udevd'
 command: pgrep -f '/sbin/udevd' >/dev/null
 _description: Test if the udevd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/winbindd
+id: daemons/winbindd
 requires: package.name == 'winbind'
 command: pgrep -f '/usr/sbin/winbindd' >/dev/null
 _description: Test if the winbindd daemon is running when the package is installed.
diff --git a/jobs/disk.txt.in b/jobs/disk.txt.in
index 8932b1f..7e58a62 100644
--- a/jobs/disk.txt.in
+++ b/jobs/disk.txt.in
@@ -1,16 +1,16 @@
 plugin: shell
-name: disk/detect
+id: disk/detect
 command: udev_resource | filter_templates -w "category=DISK" | awk -F': ' '$1 == "product" { print $2 }'
 _description: Detects and displays disks attached to the system.
 
 plugin: local
-name: disk/stats
+id: disk/stats
 requires: device.category == 'DISK'
 _description: Check stats changes for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/stats_`ls /sys$path/block`
+ id: disk/stats_`ls /sys$path/block`
 requires: 
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -20,7 +20,7 @@ command:
 EOF
 
 plugin: local
-name: disk/smart
+id: disk/smart
 requires:
 package.name == 'smartmontools'
 device.category == 'DISK'
@@ -28,7 +28,7 @@ _description: SMART test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/smart_`ls /sys$path/block`
+ id: disk/smart_`ls /sys$path/block`
 requires: 
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -39,14 +39,14 @@ command:
 EOF
 
 plugin: local
-name: disk/read_performance
+id: disk/read_performance
 requires:
 device.category == 'DISK'
 _description: Verify system storage performs at or above baseline performance
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/read_performance_`ls /sys$path/block`
+ id: disk/read_performance_`ls /sys$path/block`
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -56,14 +56,14 @@ command:
 EOF
 
 plugin: local
-name: disk/storage_devices
+id: disk/storage_devices
 requires:
 device.category == 'DISK'
 _description: Verify that storage devices, such as Fibre Channel and RAID can be detected and perform under stress.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/storage_device_`ls /sys$path/block`
+ id: disk/storage_device_`ls /sys$path/block`
 user: root
 requires:
 device.path == "$path"
@@ -73,7 +73,7 @@ command:
 EOF
 
 plugin: shell
-name: disk/spindown
+id: disk/spindown
 requires: 
 device.category == 'DISK'
 package.name == 'smartmontools'
@@ -83,7 +83,7 @@ _description:
 Some new hard drives include a feature that parks the drive heads after a short period of inactivity. This is a power-saving feature, but it can have a bad interaction with the operating system that results in the drive constantly parked then activated. This produces excess wear on the drive, potentially leading to early failures.
 
 plugin: user-interact
-name: disk/hdd-parking
+id: disk/hdd-parking
 requires: device.category == 'DISK'
 depends: input/accelerometer
 user: root
diff --git a/jobs/esata.txt.in b/jobs/esata.txt.in
index cc6a62b..1a3e2f5 100644
--- a/jobs/esata.txt.in
+++ b/jobs/esata.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: esata/insert
+id: esata/insert
 command: removable_storage_watcher insert ata_serial_esata
 _description:
 PURPOSE:
@@ -13,7 +13,7 @@ _description:
 selected result
 
 plugin: shell
-name: esata/storage-test
+id: esata/storage-test
 user: root
 depends: esata/insert
 command: removable_storage_test -s 268400000 ata_serial_esata
@@ -22,7 +22,7 @@ _description:
 eSATA HDD
 
 plugin: user-interact
-name: esata/remove
+id: esata/remove
 depends: esata/storage-test
 command: removable_storage_watcher remove ata_serial_esata
 _description:
diff --git a/jobs/ethernet.txt.in b/jobs/ethernet.txt.in
index 76b128b..35de6b7 100644
--- a/jobs/ethernet.txt.in
+++ b/jobs/ethernet.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: ethernet/detect
+id: ethernet/detect
 requires:
 device.category == 'NETWORK' or device.category == 'WIRELESS'
 package.name == 'module-init-tools'
@@ -9,7 +9,7 @@ estimated_duration: 1.2
 _description: Test to detect the available network controllers
 
 plugin: shell
-name: ethernet/info_automated
+id: ethernet/info_automated
 requires:
 package.name == 'network-manager'
 device.category == 'NETWORK'
@@ -19,7 +19,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: ethernet/wired_connection
+id: ethernet/wired_connection
 command: network_check
 estimated_duration: 1.2
 _description:
@@ -33,13 +33,13 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: local
-name: ethernet/multi_nic
+id: ethernet/multi_nic
 requires: device.category == 'NETWORK'
 _description: Automated test to walk multiple network cards and test each one in sequence.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/multi_nic_$2
+ id: ethernet/multi_nic_$2
 requires:
 package.name == 'ethtool'
 package.name == 'nmap'
@@ -53,13 +53,13 @@ command:
 EOF
 
 plugin: local
-name: ethernet/ethtool_info
+id: ethernet/ethtool_info
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/ethertool_check_$2
+ id: ethernet/ethertool_check_$2
 requires: device.path == "$1"
 command: ethtool $2
 estimated_duration: 330.0
@@ -70,7 +70,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: ethernet/maximum_bandwidth
+id: ethernet/maximum_bandwidth
 requires:
 device.category == 'NETWORK'
 package.name == 'zenity'
@@ -79,7 +79,7 @@ command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-verify
 user: root
- name: ethernet/maximum_bandwidth_$2
+ id: ethernet/maximum_bandwidth_$2
 requires: device.path == "$1"
 command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'ethernet max bw $2'
 estimated_duration: 330.0
@@ -97,14 +97,14 @@ _description:
 This test executes a maximum throughput test against all the ethernet devices found on the system.
 
 plugin: local
-name: ethernet/stress_performance
+id: ethernet/stress_performance
 requires:
 device.category == 'NETWORK'
 _description: Automated test that tests performance of each wired network device under stress.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/stress_performance_$2
+ id: ethernet/stress_performance_$2
 requires: device.path == "$1"
 user: root
 command: network test -i $2 -t stress
diff --git a/jobs/expresscard.txt.in b/jobs/expresscard.txt.in
index de0da64..c45351f 100644
--- a/jobs/expresscard.txt.in
+++ b/jobs/expresscard.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: expresscard/verification
+id: expresscard/verification
 _description:
 PURPOSE:
 This will verify that an ExpressCard slot can detect inserted devices.
diff --git a/jobs/fingerprint.txt.in b/jobs/fingerprint.txt.in
index 7bf12e6..4feb543 100644
--- a/jobs/fingerprint.txt.in
+++ b/jobs/fingerprint.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: fingerprint/login
+id: fingerprint/login
 _description:
 PURPOSE:
 This test will verify that a fingerprint reader will work properly for logging into your system. This test case assumes that there's a testing account from which test cases are run and a personal account that the tester uses to verify the fingerprint reader
@@ -14,7 +14,7 @@ _description:
 Did the authentication procedure work correctly?
 
 plugin: manual
-name: fingerprint/unlock
+id: fingerprint/unlock
 _description:
 PURPOSE:
 This test will verify that a fingerprint reader can be used to unlock a locked system.
diff --git a/jobs/firewire.txt.in b/jobs/firewire.txt.in
index 343ff6a..448a1de 100644
--- a/jobs/firewire.txt.in
+++ b/jobs/firewire.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: firewire/insert
+id: firewire/insert
 command: removable_storage_watcher insert firewire
 _description:
 PURPOSE:
@@ -13,7 +13,7 @@ _description:
 selected result
 
 plugin: shell
-name: firewire/storage-test
+id: firewire/storage-test
 user: root
 depends: firewire/insert
 command: removable_storage_test -s 268400000 firewire
@@ -22,7 +22,7 @@ _description:
 FireWire HDD
 
 plugin: user-interact
-name: firewire/remove
+id: firewire/remove
 depends: firewire/storage-test
 command: removable_storage_watcher remove firewire
 _description:
diff --git a/jobs/firmware.txt.in b/jobs/firmware.txt.in
index 555a229..a040d2f 100644
--- a/jobs/firmware.txt.in
+++ b/jobs/firmware.txt.in
@@ -1,12 +1,12 @@
 plugin: local
-name: firmware/fwts
+id: firmware/fwts
 requires: package.name == 'fwts'
 _description: Automated tests for firmware using Firmware Test Suite.
 command:
 cat << 'EOF' | run_templates -s 'fwts_test --list'
 estimated_duration: 1.2
 plugin: shell
- name: firmware/fwts_$1
+ id: firmware/fwts_$1
 requires: package.name == 'fwts'
 user: root
 command: fwts_test -t $1 -l $CHECKBOX_DATA/fwts_$1.log
@@ -14,14 +14,14 @@ command:
 EOF
 
 plugin: local
-name: firmware/fwts_logs
+id: firmware/fwts_logs
 requires: package.name == 'fwts'
 _description: Automated tests for firmware using Firmware Test Suite.
 command:
 cat << 'EOF' | run_templates -s 'fwts_test --list'
 estimated_duration: 1.2
 plugin: attachment
- name: firmware/fwts_$1.log
+ id: firmware/fwts_$1.log
 requires: package.name == 'fwts'
 user: root
 command: [[ -e ${CHECKBOX_DATA}/fwts_$1.log ]] && cat ${CHECKBOX_DATA}/fwts_$1.log
diff --git a/jobs/floppy.txt.in b/jobs/floppy.txt.in
index d2fc577..002fe3f 100644
--- a/jobs/floppy.txt.in
+++ b/jobs/floppy.txt.in
@@ -1,11 +1,11 @@
 plugin: local
-name: floppy/check
+id: floppy/check
 requires: device.driver == 'floppy'
 _description: Floppy test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "driver=floppy"'
 plugin: shell
- name: floppy/check_`ls /sys$path/driver/*/*/*/block`
+ id: floppy/check_`ls /sys$path/driver/*/*/*/block`
 requires: device.path == "$path"
 description: Floppy test for $product
 user: root
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 3aab560..bb5d24d 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -1,18 +1,18 @@
 plugin: shell
-name: graphics/driver_version
+id: graphics/driver_version
 command: graphics_driver
 estimated_duration: 0.500
 _description: Parses Xorg.0.Log and discovers the running X driver and version
 
 plugin: shell
-name: graphics/xorg-version
+id: graphics/xorg-version
 requires: package.name == "x11-utils"
 command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
 estimated_duration: 0.018
 _description: Test to output the Xorg version
 
 plugin: manual
-name: graphics/resolution-change
+id: graphics/resolution-change
 depends: graphics/xorg-version
 _description:
 PURPOSE:
@@ -27,7 +27,7 @@ _description:
 Did the resolution change as expected?
 
 plugin: shell
-name: graphics/xorg-process
+id: graphics/xorg-process
 requires:
 package.name == 'xorg'
 package.name == 'procps'
@@ -36,14 +36,14 @@ estimated_duration: 0.100
 _description: Test that the X process is running.
 
 plugin: shell
-name: graphics/xorg-failsafe
+id: graphics/xorg-failsafe
 requires: package.name == 'xorg'
 command: ! test -e /var/log/Xorg.failsafe.log
 estimated_duration: 0.030
 _description: Test that the X is not running in failsafe mode.
 
 plugin: user-verify
-name: graphics/resolution
+id: graphics/resolution
 requires:
 device.category == 'VIDEO'
 command: resolution_test
@@ -59,7 +59,7 @@ _description:
 Is this acceptable for your display?
 
 plugin: user-verify
-name: graphics/screen-resolution
+id: graphics/screen-resolution
 requires:
 device.category == 'VIDEO'
 package.name == 'qmlscene'
@@ -74,7 +74,7 @@ _description:
 Is this acceptable for your display?
 
 plugin: shell
-name: graphics/minimum_resolution
+id: graphics/minimum_resolution
 requires:
 device.category == 'VIDEO'
 command: resolution_test --horizontal 800 --vertical 600
@@ -86,7 +86,7 @@ _description:
 https://help.ubuntu.com/community/Installation/SystemRequirements
 
 plugin: user-verify
-name: graphics/maximum_resolution
+id: graphics/maximum_resolution
 requires:
 device.category == 'VIDEO'
 package.name == 'zenity'
@@ -101,30 +101,30 @@ _description:
 VERIFICATION:
 Is this the display's maximum resolution?
 
-name: graphics/modes
+id: graphics/modes
 plugin: shell
 command: graphics_modes_info
 estimated_duration: 0.250
 _description: Collect info on graphics modes (screen resolution and refresh rate)
 
-name: graphics/color_depth
+id: graphics/color_depth
 plugin: shell
 command: color_depth_info
 estimated_duration: 0.150
 _description: Collect info on color depth and pixel format.
 
-name: graphics/fresh_rate
+id: graphics/fresh_rate
 plugin: shell
 command: fresh_rate_info
 _description: Collect info on fresh rate.
 
-name: graphics/graphic_memory
+id: graphics/graphic_memory
 plugin: shell
 command: graphic_memory_info
 _description: Collect info on graphic memory.
 
 plugin: user-verify
-name: graphics/display
+id: graphics/display
 requires: 
 package.name == 'xorg'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
@@ -138,13 +138,13 @@ _description:
 Do you see color bars and static?
 
 plugin: shell
-name: graphics/VESA_drivers_not_in_use
+id: graphics/VESA_drivers_not_in_use
 command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
 estimated_duration: 0.011
 _description: Check that VESA drivers are not in use
 
 plugin: user-verify
-name: graphics/cycle_resolution
+id: graphics/cycle_resolution
 requires: package.name == 'xorg'
 depends: graphics/VESA_drivers_not_in_use
 command: xrandr_cycle --screenshot-dir $CHECKBOX_DATA
@@ -158,7 +158,7 @@ _description:
 Did the screen appear to be working for each mode?
 
 plugin: user-verify
-name: graphics/rotation
+id: graphics/rotation
 depends: graphics/xorg-version
 command: rotation_test
 estimated_duration: 20.000
@@ -172,21 +172,21 @@ _description:
 Did the display rotation take place without without permanent screen corruption?
 
 plugin: shell
-name: graphics/compiz_check
+id: graphics/compiz_check
 requires: package.name == 'nux-tools'
 command: ! /usr/lib/nux/unity_support_test -c -p | ansi_parser | grep ":\(\s\+\)no$"
 estimated_duration: 0.130
 _description: Check that hardware is able to run compiz
 
 plugin: shell
-name: graphics/unity-support
+id: graphics/unity-support
 requires: package.name == 'nux-tools'
 command: ! /usr/lib/nux/unity_support_test -p | ansi_parser | grep ":\(\s\+\)no"
 estimated_duration: 0.131
 _description: Check that hardware is able to run Unity 3D
 
 plugin: user-verify
-name: graphics/glxgears
+id: graphics/glxgears
 requires: package.name == 'mesa-utils'
 command: glxgears; true
 _description:
@@ -200,35 +200,35 @@ _description:
 2. Was the animation free from slowness/jerkiness?
 
 plugin: shell
-name: graphics/3d_window_open_close
+id: graphics/3d_window_open_close
 requires: package.name == 'mesa-utils'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _description: Open and close a 3D window multiple times
 
 plugin: shell
-name: graphics/3d_window_suspend_resume
+id: graphics/3d_window_suspend_resume
 requires: package.name == 'mesa-utils'
 command: window_test -t suspend-resume -i 10
 estimated_duration: 121.00
 _description: Open, suspend resume and close a 3D window multiple times
 
 plugin: shell
-name: graphics/multi_3d_windows_open_close
+id: graphics/multi_3d_windows_open_close
 requires: package.name == 'mesa-utils'
 command: window_test -t open-close-multi -i 10 -w 4
 estimated_duration: 60.000
 _description: Open and close 4 3D windows multiple times
 
 plugin: shell
-name: graphics/3d_window_move
+id: graphics/3d_window_move
 requires: package.name == 'mesa-utils'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen
 
 plugin: shell
-name: graphics/screenshot
+id: graphics/screenshot
 requires: package.name == 'fswebcam'
 command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
 _description:
@@ -240,13 +240,13 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot.jpg
+id: screenshot.jpg
 depends: graphics/screenshot
 command: base64 ${CHECKBOX_DATA}/screenshot.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
-name: graphics/screenshot_fullscreen_video
+id: graphics/screenshot_fullscreen_video
 requires: package.name == 'fswebcam'
 command:
 [ -f ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
@@ -266,13 +266,13 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot_fullscreen_video.jpg
+id: screenshot_fullscreen_video.jpg
 depends: graphics/screenshot_fullscreen_video
 command: base64 ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
 
 plugin: shell
-name: graphics/screenshot_opencv_validation
+id: graphics/screenshot_opencv_validation
 requires: package.name == 'python-opencv'
 environ: EXTERNAL_WEBCAM_DEVICE
 command:
@@ -285,7 +285,7 @@ _description:
 Check that the screenshot matches the original file using OpenCV ORB detection.
 
 plugin: attachment
-name: screenshot_opencv_validation.jpg
+id: screenshot_opencv_validation.jpg
 depends: graphics/screenshot_opencv_validation
 command: base64 ${CHECKBOX_DATA}/screenshot_opencv_validation.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_opencv_validation.
diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index 9d7749e..566068c 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact-verify
-name: power-management/hibernate_advanced
+id: power-management/hibernate_advanced
 requires:
 sleep.disk == 'supported'
 rtc.state == 'supported'
@@ -26,13 +26,13 @@ _description:
 Did the system successfully hibernate and did it work properly after waking up?
 
 plugin: shell
-name: power-management/hibernate-single-log-check
+id: power-management/hibernate-single-log-check
 command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate-single.log
 _description:
 Automated check of the hibernate log for errors discovered by fwts
 
 plugin: attachment
-name: power-management/hibernate-single-log-attach
+id: power-management/hibernate-single-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && cat $CHECKBOX_DATA/hibernate-single.log
 estimated_duration: 0.5
 description: attaches log from single hibernate/resume test to results
diff --git a/jobs/info.txt.in b/jobs/info.txt.in
index f3a7ae0..044946f 100644
--- a/jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -1,29 +1,29 @@
-name: codecs_attachment
+id: codecs_attachment
 plugin: attachment
 requires: device.driver == 'snd_hda_intel'
 command: cat /proc/asound/card*/codec#*
 estimated_duration: 0.023
 _description: Attaches a report of installed codecs for Intel HDA
 
-name: cpuinfo_attachment
+id: cpuinfo_attachment
 plugin: attachment
 command: cat /proc/cpuinfo
 estimated_duration: 0.006
 _description: Attaches a report of CPU information
 
-name: dmesg_attachment
+id: dmesg_attachment
 plugin: attachment
 command: cat /var/log/dmesg | ansi_parser
 estimated_duration: 0.640
 _description: Attaches a copy of /var/log/dmesg to the test results
 
-name: dmi_attachment
+id: dmi_attachment
 plugin: attachment
 command: [ -d /sys/class/dmi/id/ ] && (grep -r . /sys/class/dmi/id/ 2>/dev/null || true) || false
 estimated_duration: 0.044
 _description: Attaches info on DMI
 
-name: dmidecode_attachment
+id: dmidecode_attachment
 plugin: attachment
 requires: package.name == 'dmidecode'
 user: root
@@ -31,33 +31,33 @@ command: dmidecode | iconv -t 'utf-8' -c
 estimated_duration: 0.030
 _description: Attaches dmidecode output
 
-name: lshw_attachment
+id: lshw_attachment
 plugin: attachment
 requires: package.name == 'lshw'
 user: root
 command: lshw | iconv -t 'utf-8' -c
 _description: Attaches lshw output
 
-name: efi_attachment
+id: efi_attachment
 plugin: attachment
 user: root
 command: [ -d /sys/firmware/efi ] && grep -m 1 -o --color=never 'EFI v.*' /var/log/kern.log* || true
 estimated_duration: 0.5
 _description: Attaches the firmware version
 
-name: lspci_attachment
+id: lspci_attachment
 plugin: attachment
 command: lspci -vvnn | iconv -t 'utf-8' -c
 estimated_duration: 0.042
 _description: Attaches very verbose lspci output.
 
-name: lspci_network_attachment
+id: lspci_network_attachment
 plugin: attachment
 command: lspci -vvnnQ | iconv -t 'utf-8' -c
 estimated_duration: 1.322
 _description: Attaches very verbose lspci output (with central database Query).
 
-name: lsusb_attachment
+id: lsusb_attachment
 plugin: attachment
 requires: package.name == 'usbutils'
 user: root
@@ -65,30 +65,30 @@ command: lsusb -vv | iconv -t 'utf-8' -c
 estimated_duration: 0.700
 _description: List USB devices
 
-name: meminfo_attachment
+id: meminfo_attachment
 plugin: attachment
 command: cat /proc/meminfo
 estimated_duration: 0.043
 
-name: modprobe_attachment
+id: modprobe_attachment
 plugin: attachment
 command: find /etc/modprobe.* -name \*.conf | xargs cat
 estimated_duration: 0.015
 _description: Attaches the contents of the various modprobe conf files.
 
-name: modules_attachment
+id: modules_attachment
 plugin: attachment
 command: cat /etc/modules
 estimated_duration: 0.004
 _description: Attaches the contents of the /etc/modules file.
 
-name: sysctl_attachment
+id: sysctl_attachment
 plugin: attachment
 command: find /etc/sysctl.* -name \*.conf | xargs cat
 estimated_duration: 0.014
 _description: attaches the contents of various sysctl config files.
 
-name: sysfs_attachment
+id: sysfs_attachment
 plugin: attachment
 _description: Attaches a report of sysfs attributes.
 command:
@@ -99,39 +99,39 @@ command:
 done
 estimated_duration: 6.344
 
-name: udev_attachment
+id: udev_attachment
 plugin: attachment
 command: udevadm info --export-db | xml_sanitize
 estimated_duration: 1.465
 _description: Attaches a dump of the udev database showing system hardware information.
 
-name: udev_resource_attachment
+id: udev_resource_attachment
 plugin: attachment
 command: udev_resource
 estimated_duration: 0.432
 _description: Attaches the output of udev_resource, for debugging purposes
 
-name: gcov_attachment
+id: gcov_attachment
 plugin: attachment
 requires: package.name == 'lcov'
 user: root
 command: gcov_tarball
 _description: Attaches a tarball of gcov data if present.
 
-name: lsmod_attachment
+id: lsmod_attachment
 plugin: attachment
 command: lsmod_info
 estimated_duration: 0.5
 _description: Attaches a list of the currently running kernel modules.
 
 plugin: attachment
-name: acpi_sleep_attachment
+id: acpi_sleep_attachment
 command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep
 estimated_duration: 0.5
 _description: Attaches the contents of /proc/acpi/sleep if it exists.
 
 plugin: shell
-name: info/bootchart
+id: info/bootchart
 _description: Bootchart information.
 requires: package.name == 'bootchart' or package.name == 'pybootchartgui'
 user: root
@@ -140,7 +140,7 @@ command:
 [ `ls /var/log/bootchart/*.tgz 2>/dev/null | wc -l` -lt 2 ] && reboot && sleep 100
 
 plugin: local
-name: info/hdparm
+id: info/hdparm
 _description: SATA/IDE device information.
 requires:
 package.name == 'hdparm'
@@ -148,7 +148,7 @@ requires:
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: attachment
- name: info/hdparm_`ls /sys$path/block`.txt
+ id: info/hdparm_`ls /sys$path/block`.txt
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -157,7 +157,7 @@ command:
 EOF
 
 plugin: attachment
-name: bootchart.png
+id: bootchart.png
 depends: info/bootchart
 requires: package.name == 'pybootchartgui'
 _description: Attaches the bootchart png file for bootchart runs
@@ -166,7 +166,7 @@ command:
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: bootchart.tgz
+id: bootchart.tgz
 depends: info/bootchart
 _description: Attaches the bootchart log for bootchart test runs.
 command:
@@ -174,18 +174,18 @@ command:
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: installer_bootchart.tgz
+id: installer_bootchart.tgz
 command: [ -e /var/log/installer/bootchart.tgz ] && cat /var/log/installer/bootchart.tgz
 _description: installs the installer bootchart tarball if it exists.
 
 plugin: attachment
-name: installer_debug.gz
+id: installer_debug.gz
 command: [ -e /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
 estimated_duration: 0.1
 _description: Attaches the installer debug log if it exists.
 
 plugin: attachment
-name: info/touchpad_driver
+id: info/touchpad_driver
 requires: device.category == 'TOUCHPAD'
 command: touchpad_driver_info
 estimated_duration: 0.384
@@ -194,7 +194,7 @@ _description:
 the system.
 
 plugin: attachment
-name: info/audio_device_driver
+id: info/audio_device_driver
 requires:
 package.name == 'pulseaudio-utils'
 package.name == 'module-init-tools'
@@ -204,7 +204,7 @@ estimated_duration: 0.177
 _description: Lists the device driver and version for all audio devices.
 
 plugin: attachment
-name: info/network_devices
+id: info/network_devices
 requires:
 device.category == 'NETWORK' or device.category == 'WIRELESS'
 package.name == 'module-init-tools'
@@ -214,12 +214,12 @@ estimated_duration: 0.550
 _description: Provides information about network devices
 
 plugin: attachment
-name: info/xrandr
+id: info/xrandr
 command: xrandr -q --verbose
 _description: Provides information about displays attached to the system
 
 plugin: attachment
-name: info/disk_partitions
+id: info/disk_partitions
 user: root
 command: parted -l
 _description: Attaches information about disk partitions
diff --git a/jobs/input.txt.in b/jobs/input.txt.in
index b6972c2..e0f2fcb 100644
--- a/jobs/input.txt.in
+++ b/jobs/input.txt.in
@@ -1,12 +1,12 @@
 plugin: local
-name: input/pointing
+id: input/pointing
 requires:
 device.category == 'MOUSE' or device.category == 'TOUCHPAD' or device.category == 'TOUCHSCREEN'
 _description: Pointing device tests.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=MOUSE" -w "category=TOUCHPAD" -w "category=TOUCHSCREEN"'
 plugin: manual
- name: input/pointing_`echo "${product}_${category}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`_`basename $path`
+ id: input/pointing_`echo "${product}_${category}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`_`basename $path`
 requires: device.path == "$path"
 description:
 PURPOSE:
@@ -18,7 +18,7 @@ command:
 EOF
 
 plugin: manual
-name: input/mouse
+id: input/mouse
 _description:
 PURPOSE:
 This test will test your pointing device
@@ -29,7 +29,7 @@ _description:
 Did the pointing device work as expected?
 
 plugin: user-interact-verify
-name: input/keyboard
+id: input/keyboard
 command: keyboard_test
 requires: device.category == 'KEYBOARD'
 _description:
@@ -42,7 +42,7 @@ _description:
 Is your keyboard working properly?
 
 plugin: manual
-name: input/accelerometer_verify
+id: input/accelerometer_verify
 _description:
 PURPOSE:
 Manual detection of accelerometer.
@@ -52,7 +52,7 @@ _description:
 Is this system supposed to have an accelerometer?
 
 plugin: user-interact
-name: input/accelerometer
+id: input/accelerometer
 user: root
 depends: input/accelerometer_verify
 command: accelerometer_test -m
diff --git a/jobs/install.txt.in b/jobs/install.txt.in
index 01fa0f8..62d86d5 100644
--- a/jobs/install.txt.in
+++ b/jobs/install.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: install/apt-get-gets-updates
+id: install/apt-get-gets-updates
 requires: package.name == 'apt'
 user: root
 command: apt-get -d -y --force-yes dist-upgrade
diff --git a/jobs/keys.txt.in b/jobs/keys.txt.in
index e8585c1..9a50bdb 100644
--- a/jobs/keys.txt.in
+++ b/jobs/keys.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: keys/lock-screen
+id: keys/lock-screen
 requires:
 device.category == 'KEYBOARD'
 command: lock_screen_watcher
@@ -16,7 +16,7 @@ _description:
 automatically selected result.
 
 plugin: manual
-name: keys/brightness
+id: keys/brightness
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -27,7 +27,7 @@ _description:
 Did the brightness change following to your key presses?
 
 plugin: user-interact-verify
-name: keys/volume
+id: keys/volume
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -43,7 +43,7 @@ _description:
 Do the keys work as expected?
 
 plugin: user-interact-verify
-name: keys/mute
+id: keys/mute
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -58,7 +58,7 @@ _description:
 Does the mute key work as expected?
 
 plugin: manual
-name: keys/sleep
+id: keys/sleep
 requires:
 device.category == 'KEYBOARD'
 depends: suspend/suspend_advanced
@@ -72,7 +72,7 @@ _description:
 Did the system go to sleep after pressing the sleep key?
 
 plugin: user-interact-verify
-name: keys/battery-info
+id: keys/battery-info
 requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: key_test -s '0xe071,0xef1:Battery Info'
@@ -88,7 +88,7 @@ _description:
 Did the Battery Info key work as expected?
 
 plugin: manual
-name: keys/wireless
+id: keys/wireless
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -106,7 +106,7 @@ _description:
 only consider the functionality of the wifi itself here.)
 
 plugin: user-interact
-name: keys/media-control
+id: keys/media-control
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -122,7 +122,7 @@ _description:
 Do the keys work as expected?
 
 plugin: user-interact
-name: keys/super
+id: keys/super
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -137,7 +137,7 @@ _description:
 Does the super key work as expected?
 
 plugin: manual
-name: keys/video-out
+id: keys/video-out
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -149,7 +149,7 @@ _description:
 Check that the video signal can be mirrored, extended, displayed on external or onboard only.
 
 plugin: manual
-name: keys/touchpad
+id: keys/touchpad
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -162,7 +162,7 @@ _description:
 Verify the touchpad has been disabled and re-enabled.
 
 plugin: manual
-name: keys/keyboard-backlight
+id: keys/keyboard-backlight
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -176,7 +176,7 @@ _description:
 Did the keyboard backlight state change on each press?
 
 plugin: user-interact-verify
-name: keys/microphone-mute
+id: keys/microphone-mute
 requires:
 device.category == 'AUDIO'
 device.category == 'KEYBOARD'
@@ -195,7 +195,7 @@ _description:
 Does the microphone mute key work as expected?
 
 plugin: manual
-name: keys/hibernate
+id: keys/hibernate
 requires: dmi.product in ['Notebook','Laptop','Portable']
 depends: power-management/hibernate_advanced
 _description:
@@ -209,7 +209,7 @@ _description:
 Did the system go to hibernate after pressing the hibernate key?
 
 plugin: manual
-name: keys/keyboard-overhead-light
+id: keys/keyboard-overhead-light
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
diff --git a/jobs/led.txt.in b/jobs/led.txt.in
index 1fb0d84..5073460 100644
--- a/jobs/led.txt.in
+++ b/jobs/led.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: led/power
+id: led/power
 _description:
 PURPOSE:
 Power LED verification
@@ -9,7 +9,7 @@ _description:
 Does the power LED light as expected?
 
 plugin: manual
-name: led/power-blink-suspend
+id: led/power-blink-suspend
 depends: suspend/suspend_advanced
 _description:
 PURPOSE:
@@ -20,7 +20,7 @@ _description:
 Did the Power LED blink or change color while the system was suspended for the previous suspend test?
 
 plugin: manual
-name: led/suspend
+id: led/suspend
 _description:
 PURPOSE:
 Suspend LED verification.
@@ -32,7 +32,7 @@ _description:
 Did the Suspend LED blink or change color while the system was suspended?
 
 plugin: manual
-name: led/battery-charging
+id: led/battery-charging
 _description:
 PURPOSE:
 Validate that the battery light shows charging status
@@ -43,7 +43,7 @@ _description:
 Did the battery indicator LED turn orange?
 
 plugin: manual
-name: led/battery-charged
+id: led/battery-charged
 _description:
 PURPOSE:
 Validate that the battery LED properly displays charged status
@@ -55,7 +55,7 @@ _description:
 Does the orange battery LED shut off when system is fully charged?
 
 plugin: manual
-name: led/battery-low
+id: led/battery-low
 _description:
 PURPOSE:
 Validate that the battery LED indicated low power
@@ -66,7 +66,7 @@ _description:
 Does the LED light orange when battery is low?
 
 plugin: user-interact-verify
-name: led/hdd
+id: led/hdd
 command: led_hdd_test
 _description:
 PURPOSE:
@@ -78,7 +78,7 @@ _description:
 Did the HDD LED light?
 
 plugin: user-interact-verify
-name: led/numeric-keypad
+id: led/numeric-keypad
 command: keyboard_test
 _description:
 PURPOSE:
@@ -92,7 +92,7 @@ _description:
 2. Numbers should only be entered in the keyboard verification window when the LED is on
 
 plugin: manual
-name: led/caps-lock
+id: led/caps-lock
 _description:
 PURPOSE:
 Block cap keys LED verification
@@ -103,7 +103,7 @@ _description:
 Did the Cap Keys LED light as expected?
 
 plugin: manual
-name: led/wlan
+id: led/wlan
 depends: keys/wireless
 _description:
 PURPOSE:
@@ -116,7 +116,7 @@ _description:
 Did the WLAN LED turn on or change color as expected?
 
 plugin: manual
-name: led/wlan-disabled
+id: led/wlan-disabled
 depends: keys/wireless
 _description:
 PURPOSE:
@@ -129,7 +129,7 @@ _description:
 Did the WLAN LED turn off or change color as expected?
 
 plugin: manual
-name: led/bluetooth
+id: led/bluetooth
 depends: bluetooth/detect-output
 _description:
 PURPOSE:
@@ -143,7 +143,7 @@ _description:
 Did the bluetooth LED turn off and on twice?
 
 plugin: user-interact-verify
-name: led/camera
+id: led/camera
 depends: camera/detect
 command: camera_test led
 _description:
@@ -156,7 +156,7 @@ _description:
 Did the camera LED light?
 
 plugin: manual
-name: led/touchpad
+id: led/touchpad
 _description:
 PURPOSE:
 Touchpad LED verification
@@ -169,7 +169,7 @@ _description:
 3. When the LED is off, the mouse pointer should not move on touchpad usage
 
 plugin: manual
-name: led/wireless
+id: led/wireless
 _description:
 PURPOSE:
 Wireless (WLAN + Bluetooth) LED verification
@@ -184,7 +184,7 @@ _description:
 Did the WLAN/Bluetooth LED light as expected?
 
 plugin: manual
-name: led/mute
+id: led/mute
 depends: keys/mute
 _description:
 PURPOSE:
diff --git a/jobs/local.txt.in b/jobs/local.txt.in
index 960b5f8..34a2d17 100644
--- a/jobs/local.txt.in
+++ b/jobs/local.txt.in
@@ -1,326 +1,326 @@
-name: __audio__
+id: __audio__
 plugin: local
 _description: Audio tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/audio.txt?(.in)
 
-name: __benchmarks__
+id: __benchmarks__
 plugin: local
 _description: Benchmarks tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/benchmarks.txt?(.in)
 
-name: __bluetooth__
+id: __bluetooth__
 plugin: local
 _description: Bluetooth tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/bluetooth.txt?(.in)
 
-name: __camera__
+id: __camera__
 plugin: local
 _description: Camera tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/camera.txt?(.in)
 
-name: __codecs__
+id: __codecs__
 plugin: local
 _description: Codec tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/codecs.txt?(.in)
 
-name: __cpu__
+id: __cpu__
 plugin: local
 _description: CPU tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/cpu.txt?(.in)
 
-name: __daemons__
+id: __daemons__
 plugin: local
 _description: System Daemon tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/daemons.txt?(.in)
 
-name: __disk__
+id: __disk__
 plugin: local
 _description: Disk tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/disk.txt?(.in)
 
-name: __ethernet__
+id: __ethernet__
 plugin: local
 _description: Ethernet Device tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/ethernet.txt?(.in)
 
-name: __esata__
+id: __esata__
 plugin: local
 _description: eSATA disk tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/esata.txt?(.in)
 
-name: __fingerprint__
+id: __fingerprint__
 plugin: local
 _description: Fingerprint reader tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/fingerprint.txt?(.in)
 
-name: __firewire__
+id: __firewire__
 plugin: local
 _description: Firewire disk tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/firewire.txt?(.in)
 
-name: __firmware__
+id: __firmware__
 plugin: local
 _description: Firmware tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/firmware.txt?(.in)
 
-name: __floppy__
+id: __floppy__
 plugin: local
 _description: Floppy disk tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/floppy.txt?(.in)
 
-name: __graphics__
+id: __graphics__
 plugin: local
 _description: Graphics tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/graphics.txt?(.in)
 
-name: __hibernate__
+id: __hibernate__
 plugin: local
 _description: Hibernation tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/hibernate.txt?(.in)
 
-name: __info__
+id: __info__
 plugin: local
 _description: Informational tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/info.txt?(.in)
 
-name: __input__
+id: __input__
 plugin: local
 _description: Input Devices tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/input.txt?(.in)
 
-name: __install__
+id: __install__
 plugin: local
 _description: Software Installation tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/install.txt?(.in)
 
-name: __keys__
+id: __keys__
 plugin: local
 _description: Hotkey tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/keys.txt?(.in)
 
-name: __led__
+id: __led__
 plugin: local
 _description: LED tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/led.txt?(.in)
 
-name: __mediacard__
+id: __mediacard__
 plugin: local
 _description: Media Card tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/mediacard.txt?(.in)
 
-name: __memory__
+id: __memory__
 plugin: local
 _description: Memory tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/memory.txt?(.in)
 
-name: __rendercheck__
+id: __rendercheck__
 plugin: local
 _description: Rendercheck tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/rendercheck.txt?(.in)
 
-name: __mir__
+id: __mir__
 plugin: local
 _description: MIR tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/mir.txt?(.in)
 
-name: __miscellanea__
+id: __miscellanea__
 plugin: local
 _description: Miscellaneous tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/miscellanea.txt?(.in)
 
-name: __monitor__
+id: __monitor__
 plugin: local
 _description: Monitor tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/monitor.txt?(.in)
 
-name: __networking__
+id: __networking__
 plugin: local
 _description: Non-device specific networking tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/networking.txt?(.in)
 
-name: __optical__
+id: __optical__
 plugin: local
 _description: Optical Drive tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/optical.txt?(.in)
 
-name: __panel_clock__
+id: __panel_clock__
 plugin: local
 _description: Panel Clock Verification tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/panel_clock_test.txt?(.in)
 
-name: __panel_reboot__
+id: __panel_reboot__
 plugin: local
 _description: Panel Reboot Verification tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/panel_reboot.txt?(.in)
 
-name: __expresscard__
+id: __expresscard__
 plugin: local
 _description: ExpressCard tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/expresscard.txt?(.in)
 
-name: __peripheral__
+id: __peripheral__
 plugin: local
 _description: Peripheral tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/peripheral.txt?(.in)
 
-name: __piglit__
+id: __piglit__
 plugin: local
 _description: Piglit tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/piglit.txt?(.in)
 
-name: __power-management__
+id: __power-management__
 plugin: local
 _description: Power Management tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/power-management.txt?(.in)
 
-name: __server-services__
+id: __server-services__
 plugin: local
 _description: Server Services checks
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/server-services.txt?(.in)
 
-name: __suspend__
+id: __suspend__
 plugin: local
 _description: Suspend tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/suspend.txt?(.in)
 
-name: __touchpad__
+id: __touchpad__
 plugin: local
 _description: Touchpad tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/touchpad.txt?(.in)
 
-name: __touchscreen__
+id: __touchscreen__
 plugin: local
 _description: Touchscreen tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/touchscreen.txt?(.in)
 
-name: __usb__
+id: __usb__
 plugin: local
 _description: USB tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/usb.txt?(.in)
 
-name: __user_apps__
+id: __user_apps__
 plugin: local
 _description: User Applications
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/user_apps.txt?(.in)
 
-name: __virtualization__
+id: __virtualization__
 plugin: local
 _description: Virtualization tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/virtualization.txt?(.in)
 
-name: __wireless__
+id: __wireless__
 plugin: local
 _description: Wireless networking tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/wireless.txt?(.in)
 
-name: __mobilebroadband__
+id: __mobilebroadband__
 plugin: local
 _description: Mobile broadband tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/mobilebroadband.txt?(.in)
 
-name: __stress__
+id: __stress__
 plugin: local
 _description: Stress tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/stress.txt?(.in)
 
-name: __smoke__
+id: __smoke__
 plugin: local
 _description: Smoke tests
 command:
 shopt -s extglob
 cat $CHECKBOX_SHARE/jobs/smoke.txt?(.in)
 
-name: __sniff__
+id: __sniff__
 plugin: local
 _description: Sniff Sniffers
 command:
diff --git a/jobs/mediacard.txt.in b/jobs/mediacard.txt.in
index 160af1e..262f1ff 100644
--- a/jobs/mediacard.txt.in
+++ b/jobs/mediacard.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: mediacard/mmc-insert
+id: mediacard/mmc-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -16,7 +16,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/mmc-storage
+id: mediacard/mmc-storage
 estimated_duration: 30.0
 depends: mediacard/mmc-insert
 user: root
@@ -26,7 +26,7 @@ _description:
 test is run. It tests reading and writing to the MMC card.
 
 plugin: user-interact
-name: mediacard/mmc-remove
+id: mediacard/mmc-remove
 estimated_duration: 30.0
 depends: mediacard/mmc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -42,7 +42,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/sd-insert
+id: mediacard/sd-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -59,7 +59,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sd-storage
+id: mediacard/sd-storage
 estimated_duration: 30.0
 depends: mediacard/sd-insert
 user: root
@@ -69,7 +69,7 @@ _description:
 test is run. It tests reading and writing to the SD card.
 
 plugin: user-interact
-name: mediacard/sd-remove
+id: mediacard/sd-remove
 estimated_duration: 30.0
 depends: mediacard/sd-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -85,7 +85,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sd-preinserted
+id: mediacard/sd-preinserted
 estimated_duration: 30.0
 user: root
 requires: device.category == 'CARDREADER'
@@ -96,7 +96,7 @@ _description:
 It is intended for SRU automated testing.
 
 plugin: user-interact
-name: mediacard/sdhc-insert
+id: mediacard/sdhc-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -114,7 +114,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdhc-storage
+id: mediacard/sdhc-storage
 estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 user: root
@@ -124,7 +124,7 @@ _description:
 test is run. It tests reading and writing to the SDHC card.
 
 plugin: user-interact
-name: mediacard/sdhc-remove
+id: mediacard/sdhc-remove
 estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -140,7 +140,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/cf-insert
+id: mediacard/cf-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -157,7 +157,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/cf-storage
+id: mediacard/cf-storage
 estimated_duration: 30.0
 depends: mediacard/cf-insert
 user: root
@@ -167,7 +167,7 @@ _description:
 test is run. It tests reading and writing to the CF card.
 
 plugin: user-interact
-name: mediacard/cf-remove
+id: mediacard/cf-remove
 depends: mediacard/cf-storage
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -183,7 +183,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/sdxc-insert
+id: mediacard/sdxc-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -200,7 +200,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdxc-storage
+id: mediacard/sdxc-storage
 estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 user: root
@@ -210,7 +210,7 @@ _description:
 test is run. It tests reading and writing to the SDXC card.
 
 plugin: user-interact
-name: mediacard/sdxc-remove
+id: mediacard/sdxc-remove
 estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -226,7 +226,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/ms-insert
+id: mediacard/ms-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -243,7 +243,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/ms-storage
+id: mediacard/ms-storage
 estimated_duration: 30.0
 depends: mediacard/ms-insert
 user: root
@@ -253,7 +253,7 @@ _description:
 test is run. It tests reading and writing to the MS card.
 
 plugin: user-interact
-name: mediacard/ms-remove
+id: mediacard/ms-remove
 estimated_duration: 30.0
 depends: mediacard/ms-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -269,7 +269,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/msp-insert
+id: mediacard/msp-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -286,7 +286,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/msp-storage
+id: mediacard/msp-storage
 estimated_duration: 30.0
 depends: mediacard/msp-insert
 user: root
@@ -296,7 +296,7 @@ _description:
 test is run. It tests reading and writing to the MSP card.
 
 plugin: user-interact
-name: mediacard/msp-remove
+id: mediacard/msp-remove
 estimated_duration: 30.0
 depends: mediacard/msp-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -312,7 +312,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/xd-insert
+id: mediacard/xd-insert
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -329,7 +329,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/xd-storage
+id: mediacard/xd-storage
 estimated_duration: 30.0
 depends: mediacard/xd-insert
 user: root
@@ -339,7 +339,7 @@ _description:
 test is run. It tests reading and writing to the xD card.
 
 plugin: user-interact
-name: mediacard/xd-remove
+id: mediacard/xd-remove
 estimated_duration: 30.0
 depends: mediacard/xd-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -355,7 +355,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
-name: mediacard/sd-performance-manual
+id: mediacard/sd-performance-manual
 depends: mediacard/sd-insert
 estimated_duration: 120.0
 user: root
@@ -370,7 +370,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/sdhc-performance-manual
+id: mediacard/sdhc-performance-manual
 depends: mediacard/sdhc-insert
 estimated_duration: 120.0
 user: root
@@ -385,7 +385,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/mmc-performance-manual
+id: mediacard/mmc-performance-manual
 depends: mediacard/mmc-insert
 estimated_duration: 120.0
 user: root
@@ -400,7 +400,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/cf-performance-manual
+id: mediacard/cf-performance-manual
 depends: mediacard/cf-insert
 estimated_duration: 120.0
 user: root
@@ -415,7 +415,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/sdxc-performance-manual
+id: mediacard/sdxc-performance-manual
 depends: mediacard/sdxc-insert
 estimated_duration: 120.0
 user: root
@@ -430,7 +430,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/ms-performance-manual
+id: mediacard/ms-performance-manual
 depends: mediacard/ms-insert
 estimated_duration: 120.0
 user: root
@@ -445,7 +445,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/msp-performance-manual
+id: mediacard/msp-performance-manual
 depends: mediacard/msp-insert
 estimated_duration: 120.0
 user: root
@@ -460,7 +460,7 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
-name: mediacard/xd-performance-manual
+id: mediacard/xd-performance-manual
 depends: mediacard/xd-insert
 estimated_duration: 120.0
 user: root
diff --git a/jobs/memory.txt.in b/jobs/memory.txt.in
index df1ab48..1678b9b 100644
--- a/jobs/memory.txt.in
+++ b/jobs/memory.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: memory/info
+id: memory/info
 user: root
 command: memory_compare
 _description:
@@ -7,7 +7,7 @@ _description:
 the size of the memory modules detected by DMI.
 
 plugin: shell
-name: memory/check
+id: memory/check
 user: root
 requires:
 uname.name == 'Linux'
diff --git a/jobs/mir.txt.in b/jobs/mir.txt.in
index ad34785..0482da5 100644
--- a/jobs/mir.txt.in
+++ b/jobs/mir.txt.in
@@ -1,26 +1,26 @@
 plugin: local
-name: mir/integration
+id: mir/integration
 requires: package.name == 'mir-test-tools'
 _description: MIR Integration tests
 command:
 cat << 'EOF' | run_templates -s "mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'"
 estimated_duration: 0.5
 plugin: shell
- name: mir/integration/$1
+ id: mir/integration/$1
 requires: package.name == 'mir-test-tools'
 command: mir_integration_tests --gtest_filter=$1*
 _description: Run $1 test from MIR Integration tests.
 EOF
 
 plugin: local
-name: mir/acceptance
+id: mir/acceptance
 requires: package.name == 'mir-test-tools'
 _description: MIR Acceptance tests
 command:
 cat << 'EOF' | run_templates -s "mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'"
 estimated_duration: 0.5
 plugin: shell
- name: mir/acceptance/$1
+ id: mir/acceptance/$1
 requires: package.name == 'mir-test-tools'
 command: mir_acceptance_tests --gtest_filter=$1*
 _description: Run $1 test from MIR Acceptance tests.
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index 4a8b4eb..c9f0047 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: miscellanea/submission-resources
+id: miscellanea/submission-resources
 depends:
 cpuinfo
 dmi
@@ -17,7 +17,7 @@ _description:
 A meta-job depending on the resources needed for a valid submission.
 
 plugin: manual
-name: miscellanea/tester-info
+id: miscellanea/tester-info
 _description:
 PURPOSE:
 Keep tester related information in the report
@@ -31,7 +31,7 @@ _description:
 Nothing to verify for this test
 
 plugin: user-interact-verify
-name: miscellanea/chvt
+id: miscellanea/chvt
 requires:
 package.name == 'kbd'
 user: root
@@ -45,7 +45,7 @@ _description:
 Did your screen change temporarily to a text console and then switch back to your current session?
 
 plugin: shell
-name: miscellanea/fwts_test
+id: miscellanea/fwts_test
 estimated_duration: 1.2
 requires:
 package.name == 'fwts'
@@ -57,13 +57,13 @@ command:
 fwts_test -l $CHECKBOX_DATA/fwts_results.log
 
 plugin: attachment
-name: miscellanea/fwts_results.log
+id: miscellanea/fwts_results.log
 command:
 [[ -e ${CHECKBOX_DATA}/fwts_results.log ]] && cat ${CHECKBOX_DATA}/fwts_results.log
 _description: Attaches the FWTS results log to the submission
 
 plugin: shell
-name: miscellanea/ipmi_test
+id: miscellanea/ipmi_test
 requires: package.name == 'ipmitool'
 user: root
 command: ipmi_test
@@ -71,32 +71,32 @@ _description:
 This will run some basic connectivity tests against a BMC, verifying that IPMI works.
 
 plugin: shell
-name: miscellanea/is_laptop
+id: miscellanea/is_laptop
 user: root
 _description:
 Determine if we need to run tests specific to portable computers that may not apply to desktops.
 command: check_is_laptop
 
 plugin: shell
-name: miscellanea/apport-directory
+id: miscellanea/apport-directory
 requires: package.name == 'apport'
 command: if [ -d /var/crash ]; then if [ $(find /var/crash -type f | grep -v .lock | wc -l) -eq 0 ]; then echo "/var/crash is empty"; else echo `ls /var/crash`; false; fi; else echo "/var/crash does not exist"; fi
 _description:
 Test that the /var/crash directory doesn't contain anything. Lists the files contained within if it does, or echoes the status of the directory (doesn't exist/is empty)
 
 plugin: shell
-name: miscellanea/sources-list
+id: miscellanea/sources-list
 command: sources_test $SOURCES_LIST "$REPOSITORIES"
 _description: Checks that a specified sources list file contains the requested repositories
 
 plugin: local
-name: miscellanea/pxe_boot
+id: miscellanea/pxe_boot
 requires: device.category == 'NETWORK'
 _description: Automated job to generate the PXE verification test for each NIC.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: manual
- name: miscellanea/pxe_boot_$2
+ id: miscellanea/pxe_boot_$2
 description:
 PURPOSE:
 This test will verify that you have attempted to PXE boot this machine from
@@ -110,13 +110,13 @@ command:
 EOF
 
 plugin: local
-name: miscellanea/remote_shared_ipmi
+id: miscellanea/remote_shared_ipmi
 requires: device.category == 'NETWORK'
 _description: Automated job to generate the Remote Shared IPMI verification test for each NIC.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: manual
- name: miscellanea/remote_shared_ipmi_$2
+ id: miscellanea/remote_shared_ipmi_$2
 description:
 PURPOSE:
 This test will verify that you have attempted IPMI control of this machine from the network device $2.
@@ -129,7 +129,7 @@ command:
 EOF
 
 plugin: manual
-name: miscellanea/remote_dedicated_ipmi
+id: miscellanea/remote_dedicated_ipmi
 _description:
 PURPOSE:
 Some systems do not share IPMI over all NICs but instead have a dedicated management port directly connected to the BMC. This test verifies that you have used that port for remote IPMI connections and actions.
diff --git a/jobs/mobilebroadband.txt.in b/jobs/mobilebroadband.txt.in
index 27c1282..289625e 100644
--- a/jobs/mobilebroadband.txt.in
+++ b/jobs/mobilebroadband.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: mobilebroadband/gsm_connection
+id: mobilebroadband/gsm_connection
 estimated_duration: 20.0
 requires:
 package.name == 'network-manager'
@@ -11,7 +11,7 @@ command: trap "nmcli con delete id $GSM_CONN_NAME" EXIT; create_connection mobil
 _description: Creates a mobile broadband connection for a GSM based modem and checks the connection to ensure it's working. 
 
 plugin: shell
-name: mobilebroadband/cdma_connection
+id: mobilebroadband/cdma_connection
 estimated_duration: 20.0
 requires:
 package.name == 'network-manager'
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 62ef29a..3fe919c 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: monitor/vga
+id: monitor/vga
 requires: display.vga == 'supported'
 _description:
 PURPOSE:
@@ -11,7 +11,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/dvi
+id: monitor/dvi
 requires: display.dvi == 'supported'
 _description:
 PURPOSE:
@@ -23,7 +23,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/displayport
+id: monitor/displayport
 requires: display.dp == 'supported'
 _description:
 PURPOSE:
@@ -35,7 +35,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/hdmi
+id: monitor/hdmi
 requires: display.hdmi == 'supported'
 _description:
 PURPOSE:
@@ -47,7 +47,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/svideo
+id: monitor/svideo
 requires: display.svideo == 'supported'
 _description:
 PURPOSE:
@@ -59,7 +59,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/rca
+id: monitor/rca
 requires: display.rca == 'supported'
 _description:
 PURPOSE:
@@ -71,7 +71,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/multi-head
+id: monitor/multi-head
 requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower']
 _description:
 PURPOSE:
@@ -86,7 +86,7 @@ _description:
 Was the stretched desktop displayed correctly across both screens?
 
 plugin: user-interact-verify
-name: monitor/powersaving
+id: monitor/powersaving
 command: xset dpms force off
 _description:
 PURPOSE:
@@ -98,7 +98,7 @@ _description:
 Did the monitor go blank and turn on again?
 
 plugin: user-interact-verify
-name: monitor/dim_brightness
+id: monitor/dim_brightness
 requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: brightness_test
diff --git a/jobs/networking.txt.in b/jobs/networking.txt.in
index 43075ac..5b0bb3f 100644
--- a/jobs/networking.txt.in
+++ b/jobs/networking.txt.in
@@ -1,18 +1,18 @@
 plugin: shell
-name: networking/gateway_ping
+id: networking/gateway_ping
 depends: ethernet/detect
 command: gateway_ping_test
 estimated_duration: 2.000
 _description: Tests whether the system has a working Internet connection.
 
 plugin: local
-name: networking/info
+id: networking/info
 requires: device.category == 'NETWORK'
 _description: Network Information
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-interact-verify
- name: networking/info_$2
+ id: networking/info_$2
 requires: device.path == "$1"
 command: network_info $2 | zenity --text-info --title="$2"
 _description:
@@ -25,7 +25,7 @@ command:
 EOF
 
 plugin: user-interact-verify
-name: networking/modem_connection
+id: networking/modem_connection
 command: network_check
 _description:
 PURPOSE:
@@ -42,32 +42,32 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: shell
-name: networking/ping
+id: networking/ping
 command: gateway_ping_test $CHECKBOX_SERVER
 _description:
 Automated test case to verify availability of some system on the network using ICMP ECHO packets.
 
 plugin: shell
-name: networking/http
+id: networking/http
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
 Automated test case to make sure that it's possible to download files through HTTP
 
 plugin: shell
-name: networking/ntp
+id: networking/ntp
 requires: package.name == 'ntpdate'
 user: root
 command: network_ntp_test
 _description: Test to see if we can sync local clock to an NTP server
 
 plugin: shell
-name: networking/ssh
+id: networking/ssh
 requires: package.name == 'openssh-client'
 command: if [ $CHECKBOX_SERVER ]; then ssh -q -o 'StrictHostKeyChecking=no' -o "UserKnownHostsFile=/tmp/ssh_test_$$" -l ubuntu $CHECKBOX_SERVER "uname -a" && rm /tmp/ssh_test_$$; fi
 _description: Verify that an installation of checkbox-server on the network can be reached over SSH.
 
 plugin: shell
-name: networking/printer
+id: networking/printer
 requires: package.name == 'cups-client'
 command: network_printer_test -s $CHECKBOX_SERVER
 _description: Try to enable a remote printer on the network and print a test page.
diff --git a/jobs/optical.txt.in b/jobs/optical.txt.in
index 43c5baa..819d9ee 100644
--- a/jobs/optical.txt.in
+++ b/jobs/optical.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: optical/detect
+id: optical/detect
 requires: device.category == 'CDROM'
 estimated_duration: 1.2
 _description: Test to detect the optical drives
@@ -9,14 +9,14 @@ command:
 EOF
 
 plugin: local
-name: optical/read
+id: optical/read
 requires:
 device.category == 'CDROM'
 _description: Optical read test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/read_`ls /sys$path/block`
+ id: optical/read_`ls /sys$path/block`
 requires: device.path == "$path"
 estimated_duration: 120.0
 user: root
@@ -33,14 +33,14 @@ command:
 EOF
 
 plugin: local
-name: optical/read-automated
+id: optical/read-automated
 requires:
 device.category == 'CDROM'
 _description: Automated optical read test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/read-automated_`ls /sys$path/block`
+ id: optical/read-automated_`ls /sys$path/block`
 estimated_duration: 120.0
 requires: device.path == "$path"
 user: root
@@ -50,14 +50,14 @@ command:
 EOF
 
 plugin: local
-name: optical/cdrom-write
+id: optical/cdrom-write
 requires:
 device.category == 'CDROM'
 _description: CD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/cdrom-write_`ls /sys$path/block`
+ id: optical/cdrom-write_`ls /sys$path/block`
 estimated_duration: 120.0
 requires: 
 device.path == "$path"
@@ -77,14 +77,14 @@ command:
 EOF
 
 plugin: local
-name: optical/cdrom-write-automated
+id: optical/cdrom-write-automated
 requires:
 device.category == 'CDROM'
 _description: Automated CD write test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/cdrom-write-automated_`ls /sys$path/block`
+ id: optical/cdrom-write-automated_`ls /sys$path/block`
 estimated_duration: 120.0
 requires: 
 device.path == "$path"
@@ -96,7 +96,7 @@ command:
 EOF
 
 plugin: manual
-name: optical/cdrom-audio-playback
+id: optical/cdrom-audio-playback
 depends: optical/read
 estimated_duration: 120.0
 _description:
@@ -116,14 +116,14 @@ _description:
 Did all the steps work?
 
 plugin: local
-name: optical/dvd-write
+id: optical/dvd-write
 requires:
 device.category == 'CDROM'
 _description: DVD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/dvd-write_`ls /sys$path/block`
+ id: optical/dvd-write_`ls /sys$path/block`
 requires: 
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.dvd_write == 'supported'
@@ -143,14 +143,14 @@ command:
 EOF
 
 plugin: local
-name: optical/dvd-write-automated
+id: optical/dvd-write-automated
 requires:
 device.category == 'CDROM'
 _description: Automated DVD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/dvd-write-automated_`ls /sys$path/block`
+ id: optical/dvd-write-automated_`ls /sys$path/block`
 estimated_duration: 120.0
 requires: 
 device.path == "$path"
@@ -162,7 +162,7 @@ command:
 EOF
 
 plugin: user-interact-verify
-name: optical/dvd_playback
+id: optical/dvd_playback
 command: totem /media/cdrom
 estimated_duration: 120.0
 requires:
@@ -178,13 +178,13 @@ _description:
 Did the file play?
 
 plugin: local
-name: optical/bluray-read
+id: optical/bluray-read
 requires: device.category == 'CDROM'
 _description: Automated Blu-Ray read test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact
- name: optical/bluray-read_`ls /sys$path/block`
+ id: optical/bluray-read_`ls /sys$path/block`
 estimated_duration: 120.0
 requires:
 device.path == "$path"
@@ -204,13 +204,13 @@ command:
 EOF
 
 plugin: local
-name: optical/bluray-write
+id: optical/bluray-write
 requires: device.category == 'CDROM'
 _description: Automated Blu-Ray write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact
- name: optical/bluray-write_`ls /sys$path/block`
+ id: optical/bluray-write_`ls /sys$path/block`
 requires:
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.bd_write == "supported"
diff --git a/jobs/panel_clock_test.txt.in b/jobs/panel_clock_test.txt.in
index 2b41da8..22f14fb 100644
--- a/jobs/panel_clock_test.txt.in
+++ b/jobs/panel_clock_test.txt.in
@@ -1,4 +1,4 @@
-name: panel_clock/verify
+id: panel_clock/verify
 plugin: manual
 requires: package.name == 'gnome-system-tools'
 _description:
@@ -9,7 +9,7 @@ _description:
 VERIFICATION:
 Is the clock displaying the correct date and time for your timezone?
 
-name: panel_clock/test
+id: panel_clock/test
 plugin: user-interact-verify
 depends: panel_clock/verify
 requires: package.name == 'gnome-system-tools'
diff --git a/jobs/panel_reboot.txt.in b/jobs/panel_reboot.txt.in
index 8dada11..f4e6290 100644
--- a/jobs/panel_reboot.txt.in
+++ b/jobs/panel_reboot.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: panel_reboot_test
+id: panel_reboot_test
 _description:
 PURPOSE:
 This test will verify that you can reboot your system from the desktop menu
diff --git a/jobs/peripheral.txt.in b/jobs/peripheral.txt.in
index 6f7bbe1..17b8d32 100644
--- a/jobs/peripheral.txt.in
+++ b/jobs/peripheral.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: peripheral/printer
+id: peripheral/printer
 _description:
 PURPOSE:
 This test will verify that a network printer is usable
@@ -13,7 +13,7 @@ _description:
 Were you able to print a test page to the network printer?
 
 plugin: user-interact-verify
-name: peripheral/external-usb-modem
+id: peripheral/external-usb-modem
 command: network_check
 _description:
 PURPOSE:
@@ -31,7 +31,7 @@ _description:
 Was the connection correctly established?
 
 plugin: shell
-name: peripheral/external-usb-modem-http
+id: peripheral/external-usb-modem-http
 depends: peripheral/external-usb-modem
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
diff --git a/jobs/piglit.txt.in b/jobs/piglit.txt.in
index 5f5bfd9..b81d984 100644
--- a/jobs/piglit.txt.in
+++ b/jobs/piglit.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: piglit/fbo
+id: piglit/fbo
 requires:
 package.name == 'piglit'
 command: piglit_test -t ^spec/EXT_framebuffer_object -n fbo
@@ -8,7 +8,7 @@ _description:
 Runs piglit tests for checking support for framebuffer object operations, depth buffer and stencil buffer
 
 plugin: shell
-name: piglit/gl-2.1
+id: piglit/gl-2.1
 requires:
 package.name == 'piglit'
 command: piglit_test -t spec/'!OpenGL 2.1'/ -n gl-2.1
@@ -17,7 +17,7 @@ _description:
 Runs piglit tests for checking OpenGL 2.1 support
 
 plugin: shell
-name: piglit/vbo
+id: piglit/vbo
 requires:
 package.name == 'piglit'
 command: piglit_test -t spec/ARB_vertex_buffer_object/ -n vbo
@@ -26,7 +26,7 @@ _description:
 Runs piglit tests for checking support for vertex buffer object operations
 
 plugin: shell
-name: piglit/glsl-fragment-shader
+id: piglit/glsl-fragment-shader
 requires:
 package.name == 'piglit'
 command: piglit_test -t ^shaders/glsl-arb-fragment -n glsl-fragment-shader
@@ -35,7 +35,7 @@ _description:
 Runs piglit tests for checking support for GLSL fragment shader operations
 
 plugin: shell
-name: piglit/glsl-vertex-shader
+id: piglit/glsl-vertex-shader
 requires:
 package.name == 'piglit'
 command: piglit_test -t ^shaders/glsl-clamp-vertex-color -t ^shaders/glsl-max-vertex-attrib -t ^shaders/glsl-novertexdata -n glsl-vertex-shader
@@ -44,7 +44,7 @@ _description:
 Runs piglit tests for checking support for GLSL vertex shader operations
 
 plugin: shell
-name: piglit/glx-tfp
+id: piglit/glx-tfp
 requires:
 package.name == 'piglit'
 command: piglit_test -t glx-tfp -n glx-tfp
@@ -53,7 +53,7 @@ _description:
 Runs piglit tests for checking support for texture from pixmap
 
 plugin: shell
-name: piglit/stencil_buffer
+id: piglit/stencil_buffer
 requires:
 package.name == 'piglit'
 command: piglit_test -t glx-visuals-stencil -t readpixels-24_8 -n stencil_buffer
@@ -62,7 +62,7 @@ _description:
 Runs piglit_tests for checking support for stencil buffer operations
 
 plugin: shell
-name: piglit/summarize_results
+id: piglit/summarize_results
 requires:
 package.name == 'piglit'
 command: [ -e $CHECKBOX_DATA/piglit-results ] && piglit-summary-html.py $CHECKBOX_DATA/piglit-summary/ `find $CHECKBOX_DATA/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $CHECKBOX_DATA/piglit-sumary/"
@@ -71,7 +71,7 @@ _description:
 Runs the piglit results summarizing tool
 
 plugin: shell
-name: piglit/tarball
+id: piglit/tarball
 requires:
 package.name == 'piglit'
 depends: piglit/summarize_results
diff --git a/jobs/power-management.txt.in b/jobs/power-management.txt.in
index 99aef0f..ae664ae 100644
--- a/jobs/power-management.txt.in
+++ b/jobs/power-management.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: power-management/shutdown-boot
+id: power-management/shutdown-boot
 _description:
 PURPOSE:
 This test will check your system shutdown/booting cycle.
@@ -11,7 +11,7 @@ _description:
 Did the system shutdown and rebooted correctly?
 
 plugin: shell
-name: power-management/fwts_wakealarm
+id: power-management/fwts_wakealarm
 environ: CHECKBOX_DATA
 user: root
 _description: Test ACPI Wakealarm (fwts wakealarm)
@@ -20,7 +20,7 @@ requires:
 command: fwts_test -f aborted -t wakealarm -l $CHECKBOX_DATA/fwts-wakealarm.log
 
 plugin: attachment
-name: power-management/fwts_wakealarm-log-attach
+id: power-management/fwts_wakealarm-log-attach
 depends: power-management/fwts_wakealarm
 _description: Attach log from fwts wakealarm test
 requires:
@@ -28,7 +28,7 @@ requires:
 command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log
 
 plugin: user-interact-verify
-name: power-management/poweroff
+id: power-management/poweroff
 depends: power-management/fwts_wakealarm
 user: root
 environ: CHECKBOX_DATA
@@ -50,13 +50,13 @@ _description:
 select 'No'.
 
 plugin: attachment
-name: power-management/poweroff-log-attach
+id: power-management/poweroff-log-attach
 command: tar cvfz power-management_poweroff.tgz $CHECKBOX_DATA/*poweroff.1.log && cat $CHECKBOX_DATA/power-management_poweroff.tgz
 _description:
 This will attach any logs from the power-management/poweroff test to the results.
 
 plugin: user-interact-verify
-name: power-management/reboot
+id: power-management/reboot
 user: root
 environ: CHECKBOX_DATA
 requires:
@@ -75,13 +75,13 @@ _description:
 If the machine successfully reboots, select Yes then select Next.
 
 plugin: attachment
-name: power-management/reboot-log-attach
+id: power-management/reboot-log-attach
 command: tar cvfz power-management_reboot.tgz $CHECKBOX_DATA/*reboot.1.log && cat $CHECKBOX_DATA/power-management_reboot.tgz
 _description:
 This will attach any logs from the power-management/reboot test to the results.
 
 plugin: manual
-name: power-management/lid
+id: power-management/lid
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -92,7 +92,7 @@ _description:
 Does closing your laptop lid cause your system to suspend?
 
 plugin: user-interact
-name: power-management/lid_close
+id: power-management/lid_close
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -110,7 +110,7 @@ _description:
 Did the screen turn off while the lid was closed?
 
 plugin: user-interact
-name: power-management/lid_open
+id: power-management/lid_open
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -130,7 +130,7 @@ _description:
 Did the system resume when the lid was opened?
 
 plugin: shell
-name: power-management/rtc
+id: power-management/rtc
 requires:
 rtc.state == 'supported'
 package.name == 'util-linux'
@@ -141,13 +141,13 @@ _description:
 Verify that the Real-time clock (RTC) device functions properly, if present
 
 plugin: shell
-name: power-management/tickless_idle
+id: power-management/tickless_idle
 _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check)
 command:
 zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 )
 
 plugin: manual
-name: power-management/unplug_ac
+id: power-management/unplug_ac
 _description:
 PURPOSE:
 This test will ensure that the AC is unplugged for the battery drain tests to run.
@@ -157,7 +157,7 @@ _description:
 Was the laptop unplugged from AC?
 
 plugin: shell
-name: power-management/battery_drain_idle
+id: power-management/battery_drain_idle
 requires: package.name == 'upower'
 depends: power-management/unplug_ac
 _description: Checks the battery drain during idle. Reports time until empty
@@ -166,7 +166,7 @@ command:
 battery_test -t 90 --idle
 
 plugin: shell
-name: power-management/battery_drain_movie
+id: power-management/battery_drain_movie
 requires:
 package.name == 'upower'
 depends: power-management/unplug_ac
@@ -176,7 +176,7 @@ command:
 battery_test -t 90 --movie $MOVIE_VAR
 
 plugin: shell
-name: power-management/battery_drain_sleep
+id: power-management/battery_drain_sleep
 user: root
 requires:
 package.name == 'upower'
@@ -188,7 +188,7 @@ command:
 battery_test -t 120 --sleep
 
 plugin: manual
-name: power-management/plug_ac
+id: power-management/plug_ac
 depends: power-management/battery_drain_idle power-management/battery_drain_movie power-management/battery_drain_sleep
 _description:
 PURPOSE:
@@ -200,7 +200,7 @@ _description:
 Was the laptop plugged into AC?
 
 plugin: user-interact-verify
-name: power-management/reboot_manual
+id: power-management/reboot_manual
 user:root
 command: shutdown -r now
 _description:
@@ -218,7 +218,7 @@ _description:
 Did the system reboot correctly?
 
 plugin: user-interact-verify
-name: power-management/shutdown_manual
+id: power-management/shutdown_manual
 user: root
 command: shutdown -h now
 _description:
diff --git a/jobs/rendercheck.txt.in b/jobs/rendercheck.txt.in
index 4204c52..b0117dc 100644
--- a/jobs/rendercheck.txt.in
+++ b/jobs/rendercheck.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: rendercheck/tests
+id: rendercheck/tests
 requires:
 package.name == 'x11-apps'
 command: ( rendercheck_test -b repeat -b gradients -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
@@ -7,7 +7,7 @@ _description:
 Runs all of the rendercheck test suites. This test can take a few minutes.
 
 plugin: attachment
-name: rendercheck/tarball
+id: rendercheck/tarball
 depends: rendercheck/tests
 command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results && cat $CHECKBOX_DATA/rendercheck-results.tar.gz
 _description: Attach log from rendercheck tests
diff --git a/jobs/server-services.txt.in b/jobs/server-services.txt.in
index f667557..e151dea 100644
--- a/jobs/server-services.txt.in
+++ b/jobs/server-services.txt.in
@@ -1,17 +1,17 @@
 plugin: shell
-name: services/open_ssh_test
+id: services/open_ssh_test
 requires: package.name == 'ssh'
 command: pgrep sshd >/dev/null || (echo 'FAIL: sshd is not running.' 2>&1 && false)
 _description: Verifies that sshd is running.
 
 plugin: shell
-name: services/print_server_test
+id: services/print_server_test
 requires: package.name == 'cups'
 command: pgrep cupsd >/dev/null || (echo 'FAIL: cupsd is not running.' 2>&1 && false)
 _description: Verifies that Print/CUPs server is running.
 
 plugin: shell
-name: services/dns_server_test
+id: services/dns_server_test
 requires:
 package.name == 'bind9'
 package.name == 'dnsutils'
@@ -20,7 +20,7 @@ command: dns_server_test
 _description: Verifies that DNS server is running and working.
 
 plugin: shell
-name: services/samba_test
+id: services/samba_test
 requires:
 package.name == 'samba'
 package.name == 'winbind'
@@ -29,7 +29,7 @@ command: samba_test
 _description: Verifies that Samba server is running.
 
 plugin: shell
-name: services/lamp_test
+id: services/lamp_test
 requires:
 package.name == 'apache2'
 package.name == 'php5-mysql'
@@ -40,7 +40,7 @@ command: lamp_test
 _description: Verifies that the LAMP stack is running (Apache, MySQL and PHP).
 
 plugin: shell
-name: services/tomcat_test
+id: services/tomcat_test
 requires: package.name == 'tomcat6'
 user: root
 command: tomcat_test
diff --git a/jobs/smoke.txt.in b/jobs/smoke.txt.in
index cf9298e..4b69314 100644
--- a/jobs/smoke.txt.in
+++ b/jobs/smoke.txt.in
@@ -1,45 +1,45 @@
 plugin: shell
-name: smoke/true
+id: smoke/true
 command: true
 _description:
 Check success result from shell test case
 
 plugin: shell
-name: smoke/false
+id: smoke/false
 command: false
 _description:
 Check failed result from shell test case
 
 plugin: shell
-name: smoke/dependency/good
+id: smoke/dependency/good
 depends: smoke/true
 command: true
 _description:
 Check job is executed when dependency succeeds
 
 plugin: shell
-name: smoke/dependency/bad
+id: smoke/dependency/bad
 depends: smoke/false
 command: true
 _description:
 Check job result is set to uninitiated when dependency fails
 
 plugin: shell
-name: smoke/requirement/good
+id: smoke/requirement/good
 requires: package.name == "checkbox"
 command: true
 _description:
 Check job is executed when requirements are met
 
 plugin: shell
-name: smoke/requirement/bad
+id: smoke/requirement/bad
 requires: package.name == "unknown-package"
 command: true
 _description:
 Check job result is set to "not required on this system" when requirements are not met
 
 plugin: manual
-name: smoke/manual
+id: smoke/manual
 _description:
 PURPOSE:
 This test checks that the manual plugin works fine
diff --git a/jobs/sniff.txt.in b/jobs/sniff.txt.in
index 7908627..1fe149b 100644
--- a/jobs/sniff.txt.in
+++ b/jobs/sniff.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: sniff/sniff7
+id: sniff/sniff7
 command: true
 _description:
 PURPOSE:
@@ -10,7 +10,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff6
+id: sniff/sniff6
 _description:
 PURPOSE:
 To sniff things out
@@ -20,7 +20,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff5
+id: sniff/sniff5
 _description:
 PURPOSE:
 To sniff things out
@@ -30,7 +30,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: user-interact
-name: sniff/sniff4
+id: sniff/sniff4
 command: reboot
 user: root
 _description:
@@ -43,7 +43,7 @@ _description:
 You won't see the user-verify
 
 plugin: manual
-name: sniff/sniff3
+id: sniff/sniff3
 _description:
 PURPOSE:
 If Recovery is successful, you will see this test on restarting checkbox, not
@@ -54,7 +54,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff2
+id: sniff/sniff2
 _description:
 PURPOSE:
 To sniff things out
@@ -64,7 +64,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff1
+id: sniff/sniff1
 _description:
 PURPOSE:
 To sniff things out
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index 66f76f1..0589a8e 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: stress/cpu_stress_test
+id: stress/cpu_stress_test
 requires:
 package.name == 'stress'
 user: root
@@ -9,7 +9,7 @@ _description:
 Create jobs that use the CPU as much as possible for two hours. The test is considered passed if the system does not freeze.
 
 plugin: shell
-name: power-management/hibernate_30_cycles
+id: power-management/hibernate_30_cycles
 depends:
 power-management/hibernate_advanced
 requires:
@@ -30,19 +30,19 @@ _description:
 This is an automated stress test that will force the system to hibernate/resume for 30 cycles
 
 plugin: shell
-name: power-management/hibernate-30-cycles-log-check
+id: power-management/hibernate-30-cycles-log-check
 command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
-name: power-management/hibernate-30-cycle-log-attach
+id: power-management/hibernate-30-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && cat $CHECKBOX_DATA/hibernate_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Hibernate/Resume test if it exists
 
 plugin: shell
-name: power-management/suspend_30_cycles
+id: power-management/suspend_30_cycles
 depends:
 power-management/rtc
 suspend/suspend_advanced
@@ -61,28 +61,28 @@ _description:
 This is an automated stress test that will force the system to suspend/resume for 30 cycles.
 
 plugin: shell
-name: power-management/suspend-30-cycles-log-check
+id: power-management/suspend-30-cycles-log-check
 depends: power-management/suspend_30_cycles
 command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
-name: power-management/suspend-30-cycle-log-attach
+id: power-management/suspend-30-cycle-log-attach
 depends: power-management/suspend_30_cycles
 command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && cat $CHECKBOX_DATA/suspend_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Suspend/Resume test if it exists
 
 plugin: shell
-name: power-management/suspend-30-cycles-time-check
+id: power-management/suspend-30-cycles-time-check
 depends: power-management/suspend_30_cycles
 command: [ -e $CHECKBOX_DATA/suspend_30_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_30_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: shell
-name: stress/hibernate_250_cycles
+id: stress/hibernate_250_cycles
 depends: power-management/rtc
 environ: CHECKBOX_DATA
 user: root
@@ -99,13 +99,13 @@ _description:
 This is an automated stress test that will force the system to hibernate/resume for 250 cycles
 
 plugin: attachment
-name: stress/hibernate-250-cycle-log-attach
+id: stress/hibernate-250-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate_250_cycles.log ] && cat $CHECKBOX_DATA/hibernate_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Hibernate/Resume test if it exists
 
 plugin: shell
-name: stress/suspend_250_cycles
+id: stress/suspend_250_cycles
 depends: power-management/rtc
 environ: CHECKBOX_DATA
 user: root
@@ -122,19 +122,19 @@ _description:
 This is an automated stress test that will force the system to suspend/resume for 250 cycles.
 
 plugin: attachment
-name: stress/suspend-250-cycle-log-attach
+id: stress/suspend-250-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_250_cycles.log ] && cat $CHECKBOX_DATA/suspend_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Suspend/Resume test if it exists
 
 plugin: shell
-name: stress/suspend-250-cycles-time-check
+id: stress/suspend-250-cycles-time-check
 command: [ -e $CHECKBOX_DATA/suspend_250_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_250_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: shell
-name: stress/reboot
+id: stress/reboot
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
@@ -145,12 +145,12 @@ _description:
 Stress reboot system (100 cycles)
 
 plugin: attachment
-name: stress/reboot_log
+id: stress/reboot_log
 depends: stress/reboot
 command: tar cvfz $CHECKBOX_DATA/stress_reboot.tgz $CHECKBOX_DATA/*reboot.100.log && cat $CHECKBOX_DATA/stress_reboot.tgz
 
 plugin: shell
-name: stress/poweroff
+id: stress/poweroff
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
@@ -161,36 +161,36 @@ _description:
 Stress poweroff system (100 cycles)
 
 plugin: attachment
-name: stress/poweroff_log
+id: stress/poweroff_log
 depends: stress/poweroff
 command: tar cvfz $CHECKBOX_DATA/stress_poweroff.tgz $CHECKBOX_DATA/*poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff.tgz
 
 plugin: shell
-name: stress/reboot_check
+id: stress/reboot_check
 depends: stress/reboot
 command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.reboot.100.log $CHECKBOX_DATA/pm_log_check_reboot.100.log
 _description: Check logs for the stress reboot (100 cycles) test case
 
 plugin: attachment
-name: stress/reboot_check_log
+id: stress/reboot_check_log
 depends: stress/reboot_check
 command:
 tar cvfz $CHECKBOX_DATA/stress_reboot_check.tgz $CHECKBOX_DATA/pm_log_check_reboot.100.log && cat $CHECKBOX_DATA/stress_reboot_check.tgz
 
 plugin: shell
-name: stress/poweroff_check
+id: stress/poweroff_check
 depends: stress/poweroff
 command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.poweroff.100.log $CHECKBOX_DATA/pm_log_check_poweroff.100.log
 _description: Check logs for the stress poweroff (100 cycles) test case
 
 plugin: attachment
-name: stress/poweroff_check_log
+id: stress/poweroff_check_log
 depends: stress/poweroff_check
 command:
 tar cvfz $CHECKBOX_DATA/stress_poweroff_check.tgz $CHECKBOX_DATA/pm_log_check_poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff_check.tgz
 
 plugin: shell
-name: stress/graphics
+id: stress/graphics
 requires:
 package.name == 'x11-apps'
 user: root
@@ -200,7 +200,7 @@ _description:
 Run the graphics stress test. This test can take a few minutes.
 
 plugin: shell
-name: stress/graphics-tarball
+id: stress/graphics-tarball
 requires:
 package.name == 'x11-apps'
 depends: stress/graphics
@@ -208,13 +208,13 @@ command: [ -e $CHECKBOX_DATA/graphics-stress-results ] && tar cvfz $CHECKBOX_DAT
 _description: Attaches the graphics stress results to the submission.
 
 plugin: shell
-name: stress/usb
+id: stress/usb
 user: root
 command: removable_storage_test -s 10240000 -c 100 -i 3 usb
 _description: Runs a test that transfers 100 10MB files 3 times to usb.
 
 plugin: user-interact
-name: stress/sdhc
+id: stress/sdhc
 user: root
 _summary: Stress test for SDHC card
 estimated_duration: 780.0
@@ -233,19 +233,19 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: stress/network_restart
+id: stress/network_restart
 user: root
 environ: CHECKBOX_DATA
 command: network_restart -t 1 -o $CHECKBOX_DATA
 _description: Ping ubuntu.com and restart network interfaces 100 times
 
 plugin: attachment
-name: stress/network_restart_log
+id: stress/network_restart_log
 depends: stress/network_restart
 command: file=$CHECKBOX_DATA/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
 
 plugin: manual
-name: stress/wireless_hotkey
+id: stress/wireless_hotkey
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 515d2fb..5c0b2b2 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -1,18 +1,18 @@
 plugin: shell
-name: suspend/network_before_suspend
+id: suspend/network_before_suspend
 depends: ethernet/detect
 estimated_duration: 1.2
 _description: Record the current network before suspending.
 command: set -o pipefail; gateway_ping_test | tee $CHECKBOX_DATA/network_before_suspend.txt
 
 plugin: shell
-name: suspend/resolution_before_suspend
+id: suspend/resolution_before_suspend
 estimated_duration: 1.2
 _description: Record the current resolution before suspending.
 command: xrandr -q |grep '*'| awk '{print $1}' > $CHECKBOX_DATA/resolution_before_suspend.txt
 
 plugin: shell
-name: suspend/audio_before_suspend
+id: suspend/audio_before_suspend
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
@@ -21,20 +21,20 @@ _description: Record mixer settings before suspending.
 command: audio_settings store --file=$CHECKBOX_DATA/audio_settings_before_suspend
 
 plugin: shell
-name: suspend/cpu_before_suspend
+id: suspend/cpu_before_suspend
 estimated_duration: 1.2
 _description: Verify that all the CPUs are online before suspending
 command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend
 
 plugin: shell
-name: suspend/memory_before_suspend
+id: suspend/memory_before_suspend
 estimated_duration: 1.2
 _description:
 Dumps memory info to a file for comparison after suspend test has been run
 command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend
 
 plugin: shell
-name: suspend/wireless_before_suspend
+id: suspend/wireless_before_suspend
 depends: wireless/wireless_connection
 requires: device.category == 'WIRELESS'
 command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
@@ -44,13 +44,13 @@ _description:
 interface. It then checks the connection to confirm it's working as expected.
 
 plugin: local
-name: suspend/iperf_before_suspend_ether_auto
+id: suspend/iperf_before_suspend_ether_auto
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_ether_auto_$2
+ id: suspend/iperf_before_suspend_ether_auto_$2
 depends: ethernet/detect
 estimated_duration: 20.0
 requires: device.path == "$1"
@@ -63,13 +63,13 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: suspend/iperf_before_suspend_wifi_auto
+id: suspend/iperf_before_suspend_wifi_auto
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_wifi_auto_$2
+ id: suspend/iperf_before_suspend_wifi_auto_$2
 depends: wireless/wireless_connection
 estimated_duration: 20.0
 requires: device.path == "$1"
@@ -82,7 +82,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: shell
-name: suspend/bluetooth_obex_before_suspend
+id: suspend/bluetooth_obex_before_suspend
 estimated_duration: 10.0
 requires:
 package.name == 'bluez'
@@ -109,7 +109,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_before_suspend
+id: suspend/bluetooth_obex_send_before_suspend
 estimated_duration: 10.0
 requires:
 package.name == 'bluez'
@@ -136,7 +136,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_before_suspend
+id: suspend/bluetooth_obex_browse_before_suspend
 estimated_duration: 10.0
 requires:
 package.name == 'bluez'
@@ -163,7 +163,7 @@ _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_get_before_suspend
+id: suspend/bluetooth_obex_get_before_suspend
 estimated_duration: 20.0
 requires:
 package.name == 'bluez'
@@ -190,7 +190,7 @@ _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: user-interact-verify
-name: suspend/bluetooth_obex_before_suspend_manual
+id: suspend/bluetooth_obex_before_suspend_manual
 estimated_duration: 120.0
 requires:
 package.name == 'bluez'
@@ -208,7 +208,7 @@ _description:
 Was the data correctly transferred?
 
 plugin: user-verify
-name: suspend/suspend_advanced
+id: suspend/suspend_advanced
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
@@ -236,7 +236,7 @@ _description:
 (NOTE: Please only consider whether the system successfully suspended and resumed. Power/Suspend LED verification will occur after this test is completed.)
 
 plugin: shell
-name: suspend/suspend_advanced_auto
+id: suspend/suspend_advanced_auto
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
@@ -248,27 +248,27 @@ command: set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s
 estimated_duration: 90.000
 
 plugin: shell
-name: suspend/suspend-single-log-check
+id: suspend/suspend-single-log-check
 estimated_duration: 1.2
 command: [ -e $CHECKBOX_DATA/suspend_single.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_single.log
 _description:
 Automated check of the suspend log to look for errors reported by fwts
 
 plugin: attachment
-name: suspend/suspend-single-log-attach
+id: suspend/suspend-single-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_single.log ] && cat $CHECKBOX_DATA/suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
 plugin: shell
-name: suspend/suspend-time-check
+id: suspend/suspend-time-check
 estimated_duration: 1.2
 command: [ -e $CHECKBOX_DATA/suspend_single_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_single_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: user-interact-verify
-name: power-management/usb_wakeup_keyboard
+id: power-management/usb_wakeup_keyboard
 user: root
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
@@ -284,7 +284,7 @@ _description:
 Did the system wake up from suspend mode when you pressed a keyboard key?
 
 plugin: user-interact-verify
-name: power-management/usb_wakeup_mouse
+id: power-management/usb_wakeup_mouse
 user: root
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
@@ -300,21 +300,21 @@ _description:
 Did the system wake up from suspend mode when you pressed the mouse button?
 
 plugin: shell
-name: suspend/network_after_suspend
+id: suspend/network_after_suspend
 estimated_duration: 20.0
 depends: suspend/suspend_advanced suspend/network_before_suspend
 _description: Test the network after resuming.
 command: network_wait; gateway_ping_test | diff $CHECKBOX_DATA/network_before_suspend.txt -
 
 plugin: shell
-name: suspend/resolution_after_suspend
+id: suspend/resolution_after_suspend
 depends: suspend/suspend_advanced suspend/resolution_before_suspend
 estimated_duration: 1.2
 _description: Test to see that we have the same resolution after resuming as before.
 command: xrandr -q |grep '*'| awk '{print $1}' | diff $CHECKBOX_DATA/resolution_before_suspend.txt -
 
 plugin: shell
-name: suspend/audio_after_suspend
+id: suspend/audio_after_suspend
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
@@ -325,7 +325,7 @@ command:
 audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
 
 plugin: shell
-name: suspend/audio_after_suspend_auto
+id: suspend/audio_after_suspend_auto
 estimated_duration: 1.2
 requires:
 device.category == 'AUDIO'
@@ -336,21 +336,21 @@ command:
 audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
 
 plugin: shell
-name: suspend/cpu_after_suspend
+id: suspend/cpu_after_suspend
 estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
 command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
 
 plugin: shell
-name: suspend/cpu_after_suspend_auto
+id: suspend/cpu_after_suspend_auto
 estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
 command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
 
 plugin: shell
-name: suspend/memory_after_suspend
+id: suspend/memory_after_suspend
 estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/memory_before_suspend
 _description:
@@ -358,7 +358,7 @@ _description:
 command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
 
 plugin: shell
-name: suspend/memory_after_suspend_auto
+id: suspend/memory_after_suspend_auto
 estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
 _description:
@@ -366,7 +366,7 @@ _description:
 command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
 
 plugin: manual
-name: suspend/display_after_suspend
+id: suspend/display_after_suspend
 estimated_duration: 120.0
 depends: suspend/suspend_advanced
 _description:
@@ -378,7 +378,7 @@ _description:
 Does the display work normally after resuming from suspend?
 
 plugin: shell
-name: suspend/wireless_after_suspend
+id: suspend/wireless_after_suspend
 depends: suspend/suspend_advanced suspend/wireless_before_suspend
 requires:
 device.category == 'WIRELESS'
@@ -390,7 +390,7 @@ _description:
 connection is working as expected.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_bg
+id: suspend/wireless_connection_after_suspend_wpa_bg
 depends: suspend/suspend_advanced
 estimated_duration: 20.0
 requires:
@@ -404,7 +404,7 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_bg
+id: suspend/wireless_connection_after_suspend_open_bg
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -418,7 +418,7 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_n
+id: suspend/wireless_connection_after_suspend_wpa_n
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -433,7 +433,7 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_n
+id: suspend/wireless_connection_after_suspend_open_n
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -448,7 +448,7 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_ac
+id: suspend/wireless_connection_after_suspend_wpa_ac
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -463,7 +463,7 @@ _description:
 security and the 802.11ac protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_ac
+id: suspend/wireless_connection_after_suspend_open_ac
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -478,7 +478,7 @@ _description:
 security and the 802.11ac protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_bg_auto
+id: suspend/wireless_connection_after_suspend_wpa_bg_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -492,7 +492,7 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_bg_auto
+id: suspend/wireless_connection_after_suspend_open_bg_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -506,7 +506,7 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_n_auto
+id: suspend/wireless_connection_after_suspend_wpa_n_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -520,7 +520,7 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_n_auto
+id: suspend/wireless_connection_after_suspend_open_n_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -534,7 +534,7 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_ac_auto
+id: suspend/wireless_connection_after_suspend_wpa_ac_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -548,7 +548,7 @@ _description:
 security and the 802.11ac protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_ac_auto
+id: suspend/wireless_connection_after_suspend_open_ac_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -562,14 +562,14 @@ _description:
 security and the 802.11ac protocol after the system has been suspended.
 
 plugin: local
-name: suspend/iperf_after_suspend_ether_auto
+id: suspend/iperf_after_suspend_ether_auto
 estimated_duration: 30.0
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_after_suspend_ether_auto_$2
+ id: suspend/iperf_after_suspend_ether_auto_$2
 depends: suspend/suspend_advanced
 requires: device.path == "$1"
 user: root
@@ -581,14 +581,14 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: suspend/iperf_after_suspend_wifi_auto
+id: suspend/iperf_after_suspend_wifi_auto
 estimated_duration: 30.0
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_wifi_auto_$2
+ id: suspend/iperf_before_suspend_wifi_auto_$2
 depends: suspend/suspend_advanced
 requires: device.path == "$1"
 user: root
@@ -600,7 +600,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_wpa_bg_manual
+id: suspend/wireless_connection_after_suspend_wpa_bg_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -623,7 +623,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_open_bg_manual
+id: suspend/wireless_connection_after_suspend_open_bg_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -646,7 +646,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_wpa_n_manual
+id: suspend/wireless_connection_after_suspend_wpa_n_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -669,7 +669,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_open_n_manual
+id: suspend/wireless_connection_after_suspend_open_n_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -692,7 +692,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_wpa_ac_manual
+id: suspend/wireless_connection_after_suspend_wpa_ac_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -715,7 +715,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_open_ac_manual
+id: suspend/wireless_connection_after_suspend_open_ac_manual
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -738,7 +738,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: shell
-name: suspend/bluetooth_detect_after_suspend
+id: suspend/bluetooth_detect_after_suspend
 depends: suspend/suspend_advanced bluetooth/detect-output
 estimated_duration: 1.2
 requires:
@@ -763,7 +763,7 @@ _description:
 This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
 
 plugin: shell
-name: suspend/bluetooth_obex_after_suspend
+id: suspend/bluetooth_obex_after_suspend
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend
 estimated_duration: 10.0
 requires:
@@ -791,7 +791,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_after_suspend_auto
+id: suspend/bluetooth_obex_after_suspend_auto
 depends: suspend/suspend_advanced_auto suspend/bluetooth_obex_before_suspend
 estimated_duration: 10.0
 requires:
@@ -819,7 +819,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_after_suspend
+id: suspend/bluetooth_obex_send_after_suspend
 depends: suspend/suspend_advanced
 estimated_duration: 10.0
 requires:
@@ -847,7 +847,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_after_suspend_auto
+id: suspend/bluetooth_obex_send_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 10.0
 requires:
@@ -875,7 +875,7 @@ _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_after_suspend
+id: suspend/bluetooth_obex_browse_after_suspend
 depends: suspend/suspend_advanced
 estimated_duration: 10.0
 requires:
@@ -903,7 +903,7 @@ _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_after_suspend_auto
+id: suspend/bluetooth_obex_browse_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 requires:
@@ -931,7 +931,7 @@ _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_get_after_suspend
+id: suspend/bluetooth_obex_get_after_suspend
 estimated_duration: 20.0
 depends: suspend/suspend_advanced
 requires:
@@ -959,7 +959,7 @@ _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: shell
-name: suspend/bluetooth_obex_get_after_suspend_auto
+id: suspend/bluetooth_obex_get_after_suspend_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 requires:
@@ -987,7 +987,7 @@ _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: user-interact-verify
-name: suspend/bluetooth_obex_after_suspend_manual
+id: suspend/bluetooth_obex_after_suspend_manual
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend_manual
 estimated_duration: 120.0
 requires:
@@ -1005,7 +1005,7 @@ _description:
 Was the data correctly transferred?
 
 plugin: user-interact-verify
-name: suspend/cycle_resolutions_after_suspend
+id: suspend/cycle_resolutions_after_suspend
 estimated_duration: 120.0
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced graphics/cycle_resolution
@@ -1019,7 +1019,7 @@ _description:
 Did your display look fine in the detected mode?
 
 plugin: shell
-name: suspend/cycle_resolutions_after_suspend_auto
+id: suspend/cycle_resolutions_after_suspend_auto
 estimated_duration: 1.2
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced_auto graphics/cycle_resolution
@@ -1029,13 +1029,13 @@ _description:
 command: xrandr_cycle --keyword=after_suspend --screenshot-dir $CHECKBOX_DATA
 
 plugin: attachment
-name: suspend/xrandr_screens_after_suspend.tar.gz
+id: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend_auto
 command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend_auto test to the results submission.
 
 plugin: shell
-name: suspend/record_playback_after_suspend
+id: suspend/record_playback_after_suspend
 estimated_duration: 10.0
 depends: suspend/suspend_advanced
 requires:
@@ -1051,7 +1051,7 @@ _description:
 This will check to make sure that your audio device works properly after a suspend and resume. This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 
 plugin: shell
-name: suspend/record_playback_after_suspend_auto
+id: suspend/record_playback_after_suspend_auto
 estimated_duration: 10.0
 depends: suspend/suspend_advanced_auto
 requires:
@@ -1067,13 +1067,13 @@ _description:
 This will check to make sure that your audio device works properly after a suspend and resume. This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 
 plugin: attachment
-name: suspend/suspend-auto-single-log-attach
+id: suspend/suspend-auto-single-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_auto_single_log ] && cat $CHECKBOX_DATA/suspend_auto_single_log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
 plugin: shell
-name: suspend/screenshot_after_suspend
+id: suspend/screenshot_after_suspend
 estimated_duration: 10.0
 depends: suspend/suspend_advanced_auto
 requires: package.name == 'fswebcam'
@@ -1087,13 +1087,13 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot_after_suspend.jpg
+id: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
 command: base64 ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
-name: suspend/gpu_lockup_after_suspend
+id: suspend/gpu_lockup_after_suspend
 estimated_duration: 10.0
 requires:
 package.name == 'wmctrl'
@@ -1112,7 +1112,7 @@ _description:
 After a 60s workload, check kern.log for reported GPU errors
 
 plugin: shell
-name: suspend/wifi_resume_time
+id: suspend/wifi_resume_time
 depends: suspend/suspend_advanced
 requires:
 device.category == 'WIRELESS'
@@ -1123,7 +1123,7 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/wifi_resume_time_auto
+id: suspend/wifi_resume_time_auto
 estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto
 requires:
@@ -1134,7 +1134,7 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/network_resume_time
+id: suspend/network_resume_time
 depends: suspend/suspend_advanced
 estimated_duration: 1.2
 requires:
@@ -1145,7 +1145,7 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/network_resume_time_auto
+id: suspend/network_resume_time_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
@@ -1156,7 +1156,7 @@ _description:
 after a suspend/resume cycle.
 
 plugin: manual
-name: suspend/led_after_suspend/power
+id: suspend/led_after_suspend/power
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1168,7 +1168,7 @@ _description:
 Does the power LED remain on after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-charging
+id: suspend/led_after_suspend/battery-charging
 estimated_duration: 120.0
 depends: suspend/suspend_advanced
 _description:
@@ -1181,7 +1181,7 @@ _description:
 Did the battery indicator LED still turn orange after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-charged
+id: suspend/led_after_suspend/battery-charged
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1195,7 +1195,7 @@ _description:
 Does the orange battery LED still shut off when system is fully charged after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-low
+id: suspend/led_after_suspend/battery-low
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1208,7 +1208,7 @@ _description:
 Does the LED light orange when battery is low after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/hdd
+id: suspend/led_after_suspend/hdd
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 command: led_hdd_test
@@ -1222,7 +1222,7 @@ _description:
 Did the HDD LED still blink with HDD activity after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/numeric-keypad
+id: suspend/led_after_suspend/numeric-keypad
 estimated_duration: 120.0
 depends: suspend/suspend_advanced
 command: keyboard_test
@@ -1238,7 +1238,7 @@ _description:
 2. Numbers should only be entered in the keyboard verification window when the LED is on
 
 plugin: manual
-name: suspend/led_after_suspend/caps-lock
+id: suspend/led_after_suspend/caps-lock
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1251,7 +1251,7 @@ _description:
 Did the Cap Keys LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/wlan
+id: suspend/led_after_suspend/wlan
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1264,7 +1264,7 @@ _description:
 Did the WLAN LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/wlan-disabled
+id: suspend/led_after_suspend/wlan-disabled
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1279,7 +1279,7 @@ _description:
 Did the LED turn off then WLAN is disabled after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/bluetooth
+id: suspend/led_after_suspend/bluetooth
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1294,7 +1294,7 @@ _description:
 Did the bluetooth LED turn off and on twice after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/camera
+id: suspend/led_after_suspend/camera
 estimated_duration: 120.0
 depends:
 camera/detect
@@ -1310,7 +1310,7 @@ _description:
 Did the camera LED still turn on and off after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/touchpad
+id: suspend/led_after_suspend/touchpad
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1325,7 +1325,7 @@ _description:
 3. When the LED is off, the mouse pointer should not move on touchpad usage
 
 plugin: manual
-name: suspend/led_after_suspend/wireless
+id: suspend/led_after_suspend/wireless
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 _description:
@@ -1342,7 +1342,7 @@ _description:
 Did the WLAN/Bluetooth LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/brightness
+id: suspend/keys_after_suspend/brightness
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
@@ -1355,7 +1355,7 @@ _description:
 Did the brightness change following to your key presses after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/volume
+id: suspend/keys_after_suspend/volume
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -1373,7 +1373,7 @@ _description:
 Did the volume change following to your key presses?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/mute
+id: suspend/keys_after_suspend/mute
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -1390,7 +1390,7 @@ _description:
 Did the volume mute following your key presses?
 
 plugin: manual
-name: suspend/keys_after_suspend/sleep
+id: suspend/keys_after_suspend/sleep
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -1405,7 +1405,7 @@ _description:
 Did the system go to sleep after pressing the sleep key after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/battery-info
+id: suspend/keys_after_suspend/battery-info
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
@@ -1423,7 +1423,7 @@ _description:
 Did the Battery Info key work as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/wireless
+id: suspend/keys_after_suspend/wireless
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
@@ -1437,7 +1437,7 @@ _description:
 Did the wireless go off on the first press and on again on the second after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/media-control
+id: suspend/keys_after_suspend/media-control
 estimated_duration: 120.0
 depends: suspend/suspend_advanced
 requires:
@@ -1455,7 +1455,7 @@ _description:
 Do the keys work as expected after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/super
+id: suspend/keys_after_suspend/super
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires:
@@ -1472,7 +1472,7 @@ _description:
 Does the super key work as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/video-out
+id: suspend/keys_after_suspend/video-out
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
@@ -1486,7 +1486,7 @@ _description:
 Check that the video signal can be mirrored, extended, displayed on external or onboard only, after resuming from suspend.
 
 plugin: manual
-name: suspend/keys_after_suspend/touchpad
+id: suspend/keys_after_suspend/touchpad
 depends: suspend/suspend_advanced
 estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
@@ -1501,7 +1501,7 @@ _description:
 Verify the touchpad has been disabled and re-enabled.
 
 plugin: user-interact
-name: suspend/usb_insert_after_suspend
+id: suspend/usb_insert_after_suspend
 estimated_duration: 30.0
 depends:
 suspend/suspend_advanced
@@ -1519,7 +1519,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb3_insert_after_suspend
+id: suspend/usb3_insert_after_suspend
 estimated_duration: 30.0
 requires:
 usb.usb3 == 'supported'
@@ -1539,7 +1539,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb_remove_after_suspend
+id: suspend/usb_remove_after_suspend
 estimated_duration: 30.0
 depends:
 suspend/usb_insert_after_suspend
@@ -1556,7 +1556,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb3_remove_after_suspend
+id: suspend/usb3_remove_after_suspend
 estimated_duration: 30.0
 depends:
 suspend/usb3_insert_after_suspend
@@ -1575,7 +1575,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/usb_storage_automated_after_suspend
+id: suspend/usb_storage_automated_after_suspend
 estimated_duration: 1.2
 depends: suspend/usb_insert_after_suspend
 user: root
@@ -1585,7 +1585,7 @@ _description:
 test is run.
 
 plugin: shell
-name: suspend/usb3_storage_automated_after_suspend
+id: suspend/usb3_storage_automated_after_suspend
 estimated_duration: 1.2
 requires:
 usb.usb3 == 'supported'
@@ -1597,7 +1597,7 @@ _description:
 test is run.
 
 plugin: shell
-name: suspend/usb_storage_preinserted_after_suspend
+id: suspend/usb_storage_preinserted_after_suspend
 estimated_duration: 1.2
 user: root
 depends: suspend/suspend_advanced_auto
@@ -1608,7 +1608,7 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: shell
-name: suspend/usb3_storage_preinserted_after_suspend
+id: suspend/usb3_storage_preinserted_after_suspend
 estimated_duration: 1.2
 user: root
 requires:
@@ -1621,7 +1621,7 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: shell
-name: suspend/usb_performance_after_suspend
+id: suspend/usb_performance_after_suspend
 depends: suspend/usb_insert_after_suspend
 user: root
 estimated_duration: 45.00
@@ -1631,7 +1631,7 @@ _description:
 minimum expected speed.
 
 plugin: shell
-name: suspend/usb3_superspeed_performance_after_suspend
+id: suspend/usb3_superspeed_performance_after_suspend
 requires:
 usb.usb3 == 'supported'
 depends: suspend/usb3_insert_after_suspend
@@ -1644,7 +1644,7 @@ _description:
 USB 3.0 SuperSpeed mode.
 
 plugin: user-interact
-name: suspend/mmc-insert-after-suspend
+id: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1662,7 +1662,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/mmc-storage-after-suspend
+id: suspend/mmc-storage-after-suspend
 depends: suspend/mmc-insert-after-suspend
 estimated_duration: 10.0
 user: root
@@ -1672,7 +1672,7 @@ _description:
 is run. It tests reading and writing to the MMC card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/mmc-remove-after-suspend
+id: suspend/mmc-remove-after-suspend
 depends: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1688,7 +1688,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/sd-insert-after-suspend
+id: suspend/sd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1707,7 +1707,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/sd-storage-after-suspend
+id: suspend/sd-storage-after-suspend
 estimated_duration: 10.0
 depends: suspend/sd-insert-after-suspend
 user: root
@@ -1717,7 +1717,7 @@ _description:
 is run. It tests reading and writing to the SD card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/sd-remove-after-suspend
+id: suspend/sd-remove-after-suspend
 estimated_duration: 30.0
 depends: suspend/sd-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1734,7 +1734,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/sdhc-insert-after-suspend
+id: suspend/sdhc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1753,7 +1753,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/sdhc-storage-after-suspend
+id: suspend/sdhc-storage-after-suspend
 estimated_duration: 10.0
 depends: suspend/sdhc-insert-after-suspend
 user: root
@@ -1763,7 +1763,7 @@ _description:
 is run. It tests reading and writing to the SDHC card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/sdhc-remove-after-suspend
+id: suspend/sdhc-remove-after-suspend
 estimated_duration: 30.0
 depends: suspend/sdhc-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1779,7 +1779,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/cf-insert-after-suspend
+id: mediacard/cf-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1797,7 +1797,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/cf-storage-after-suspend
+id: mediacard/cf-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/cf-insert-after-suspend
 user: root
@@ -1807,7 +1807,7 @@ _description:
 is run. It tests reading and writing to the CF card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/cf-remove-after-suspend
+id: mediacard/cf-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/cf-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1824,7 +1824,7 @@ _description:
 
 
 plugin: user-interact
-name: mediacard/sdxc-insert-after-suspend
+id: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1842,7 +1842,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdxc-storage-after-suspend
+id: mediacard/sdxc-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/sdxc-insert-after-suspend
 user: root
@@ -1852,7 +1852,7 @@ _description:
 is run. It tests reading and writing to the SDXC card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/sdxc-remove-after-suspend
+id: mediacard/sdxc-remove-after-suspend
 depends: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1869,7 +1869,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/ms-insert-after-suspend
+id: mediacard/ms-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1887,7 +1887,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/ms-storage-after-suspend
+id: mediacard/ms-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/ms-insert-after-suspend
 user: root
@@ -1897,7 +1897,7 @@ _description:
 is run. It tests reading and writing to the MS card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/ms-remove-after-suspend
+id: mediacard/ms-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/ms-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1913,7 +1913,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/msp-insert-after-suspend
+id: mediacard/msp-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1931,7 +1931,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/msp-storage-after-suspend
+id: mediacard/msp-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/msp-insert-after-suspend
 user: root
@@ -1941,7 +1941,7 @@ _description:
 is run. It tests reading and writing to the MSP card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/msp-remove-after-suspend
+id: mediacard/msp-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/msp-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -1957,7 +1957,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/xd-insert-after-suspend
+id: mediacard/xd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
@@ -1975,7 +1975,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/xd-storage-after-suspend
+id: mediacard/xd-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/xd-insert-after-suspend
 user: root
@@ -1985,7 +1985,7 @@ _description:
 is run. It tests reading and writing to the xD card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/xd-remove-after-suspend
+id: mediacard/xd-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/xd-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
@@ -2001,7 +2001,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: touchpad/touchpad_after_suspend
+id: touchpad/touchpad_after_suspend
 depends: suspend/suspend_advanced_auto
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
@@ -2012,7 +2012,7 @@ _description:
 Determine if the touchpad is still functioning after suspend/resume.
 
 plugin: manual
-name: touchscreen/touchscreen_after_suspend
+id: touchscreen/touchscreen_after_suspend
 depends: suspend/suspend_advanced_auto
 estimated_duration: 30.0
 _description:
diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index 388d400..432d69e 100644
--- a/jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: touchpad/basic
+id: touchpad/basic
 requires: dmi.product in ['Notebook','Laptop','Portable']
 estimated_duration: 120.0
 _description:
@@ -12,7 +12,7 @@ _description:
 Did the cursor move?
 
 plugin: user-interact
-name: touchpad/horizontal
+id: touchpad/horizontal
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
 'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels
@@ -28,7 +28,7 @@ _description:
 Could you scroll right and left?
 
 plugin: user-interact
-name: touchpad/vertical
+id: touchpad/vertical
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
 'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels
@@ -44,7 +44,7 @@ _description:
 Could you scroll up and down?
 
 plugin: shell
-name: touchpad/singletouch-automated
+id: touchpad/singletouch-automated
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
 xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'dependent'
@@ -54,7 +54,7 @@ _description:
 Determine whether the touchpad is detected as a singletouch device automatically.
 
 plugin: shell
-name: touchpad/multitouch-automated
+id: touchpad/multitouch-automated
 estimated_duration: 1.2
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
@@ -64,7 +64,7 @@ _description:
 Determine whether the touchpad is detected as a multitouch device automatically.
 
 plugin: manual
-name: touchpad/multitouch-manual
+id: touchpad/multitouch-manual
 depends: touchpad/singletouch-automated
 estimated_duration: 120.0
 _description:
@@ -76,7 +76,7 @@ _description:
 Is the touchpad supposed to be multitouch?
 
 plugin: manual
-name: touchpad/singletouch-corner
+id: touchpad/singletouch-corner
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -89,7 +89,7 @@ _description:
 Did the tap trigger a new tab to be opended?
 
 plugin: manual
-name: touchpad/singletouch-selection
+id: touchpad/singletouch-selection
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -101,7 +101,7 @@ _description:
 Did a selection window open and were several files selected?
 
 plugin: manual
-name: touchpad/multitouch-rightclick
+id: touchpad/multitouch-rightclick
 depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -115,7 +115,7 @@ _description:
 Did the right click pop up menu appear?
 
 plugin: user-interact
-name: touchpad/multitouch-horizontal
+id: touchpad/multitouch-horizontal
 command: touchpad_test right left
 estimated_duration: 120.0
 _description:
@@ -128,7 +128,7 @@ _description:
 Could you scroll right and left?
 
 plugin: user-interact
-name: touchpad/multitouch-vertical
+id: touchpad/multitouch-vertical
 command: touchpad_test up down
 estimated_duration: 120.0
 _description:
@@ -141,7 +141,7 @@ _description:
 Could you scroll up and down?
 
 plugin: manual
-name: touchpad/drag-and-drop
+id: touchpad/drag-and-drop
 estimated_duration: 120.0
 _description:
 PURPOSE:
diff --git a/jobs/touchscreen.txt.in b/jobs/touchscreen.txt.in
index 0feb6d4..4a888de 100644
--- a/jobs/touchscreen.txt.in
+++ b/jobs/touchscreen.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: touchscreen/nontouch-automated
+id: touchscreen/nontouch-automated
 requires:
 xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'direct'
 command: true
@@ -8,7 +8,7 @@ _description:
 Determine whether the screen is detected as a non-touch device automatically.
 
 plugin: shell
-name: touchscreen/multitouch-automated
+id: touchscreen/multitouch-automated
 requires:
 xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'direct'
 command: true
@@ -17,7 +17,7 @@ _description:
 Determine whether the screen is detected as a multitouch device automatically.
 
 plugin: manual
-name: touchscreen/multitouch-manual
+id: touchscreen/multitouch-manual
 depends: touchscreen/nontouch-automated
 estimated_duration: 120.0
 _description:
@@ -29,7 +29,7 @@ _description:
 Is the screen supposed to be multitouch?
 
 plugin: manual
-name: touchscreen/tap-detect
+id: touchscreen/tap-detect
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -41,7 +41,7 @@ _description:
 Does tap recognition work?
 
 plugin: manual
-name: touchscreen/drag-n-drop
+id: touchscreen/drag-n-drop
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -54,7 +54,7 @@ _description:
 Does the object select and drag and drop?
 
 plugin: manual
-name: touchscreen/multitouch-zoom
+id: touchscreen/multitouch-zoom
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -67,7 +67,7 @@ _description:
 Does the screen zoom in and out?
 
 plugin: manual
-name: touchscreen/multitouch-window-move
+id: touchscreen/multitouch-window-move
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -80,7 +80,7 @@ _description:
 Did the window move along with the drag?
 
 plugin: manual
-name: touchscreen/multitouch-dash
+id: touchscreen/multitouch-dash
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
diff --git a/jobs/usb.txt.in b/jobs/usb.txt.in
index 0c08d7f..d159c39 100644
--- a/jobs/usb.txt.in
+++ b/jobs/usb.txt.in
@@ -1,11 +1,11 @@
 plugin: shell
-name: usb/detect
+id: usb/detect
 estimated_duration: 1.0
 command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
 _description: Detects and shows USB devices attached to this system.
 
 plugin: user-interact-verify
-name: usb/disk_detect
+id: usb/disk_detect
 depends: usb/detect
 estimated_duration: 1.0
 command: removable_storage_test -l usb
@@ -21,7 +21,7 @@ _description:
 Were the drives detected?
 
 plugin: user-interact-verify
-name: usb/HID
+id: usb/HID
 depends: usb/detect
 estimated_duration: 1.0
 command: keyboard_test
@@ -36,7 +36,7 @@ _description:
 Did the device work as expected?
 
 plugin: user-interact
-name: usb/insert
+id: usb/insert
 depends: usb/detect
 estimated_duration: 10.0
 command: removable_storage_watcher insert usb
@@ -55,7 +55,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: usb3/insert
+id: usb3/insert
 requires:
 usb.usb3 == 'supported'
 estimated_duration: 10.0
@@ -75,7 +75,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: usb/remove
+id: usb/remove
 depends: usb/insert
 estimated_duration: 10.0
 command: removable_storage_watcher remove usb
@@ -91,7 +91,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: usb3/remove
+id: usb3/remove
 depends: usb3/insert
 requires:
 usb.usb3 == 'supported'
@@ -109,7 +109,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
-name: usb/storage-transfer
+id: usb/storage-transfer
 depends: usb/insert
 user: root
 estimated_duration: 45.0
@@ -126,7 +126,7 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
-name: usb3/storage-transfer
+id: usb3/storage-transfer
 requires:
 usb.usb3 == 'supported'
 depends: usb3/insert
@@ -145,7 +145,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: usb/storage-automated
+id: usb/storage-automated
 depends: usb/insert
 user: root
 estimated_duration: 45.0
@@ -154,7 +154,7 @@ _description:
 This test is automated and executes after the usb/insert test is run.
 
 plugin: shell
-name: usb3/storage-automated
+id: usb3/storage-automated
 requires:
 usb.usb3 == 'supported'
 depends: usb3/insert
@@ -165,7 +165,7 @@ _description:
 This test is automated and executes after the usb3/insert test is run.
 
 plugin: shell
-name: usb/storage-preinserted
+id: usb/storage-preinserted
 user: root
 estimated_duration: 45.0
 command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
@@ -175,7 +175,7 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: shell
-name: usb3/storage-preinserted
+id: usb3/storage-preinserted
 user: root
 requires:
 usb.usb3 == 'supported'
@@ -187,7 +187,7 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: manual
-name: usb/panels
+id: usb/panels
 _description:
 PURPOSE:
 This test will check your USB connection.
@@ -201,7 +201,7 @@ _description:
 Do all USB slots work with the device?
 
 plugin: shell
-name: usb/performance
+id: usb/performance
 depends: usb/insert
 user: root
 estimated_duration: 45.00
@@ -211,7 +211,7 @@ _description:
 minimum expected speed.
 
 plugin: shell
-name: usb3/superspeed_performance
+id: usb3/superspeed_performance
 requires:
 usb.usb3 == 'supported'
 depends: usb3/insert
diff --git a/jobs/user_apps.txt.in b/jobs/user_apps.txt.in
index 2b16562..7c8a2be 100644
--- a/jobs/user_apps.txt.in
+++ b/jobs/user_apps.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact-verify
-name: software/update_manager_finds_updates
+id: software/update_manager_finds_updates
 depends: ethernet/detect
 user: root
 requires: package.name == 'update-manager'
@@ -16,7 +16,7 @@ _description:
 command: update-manager --check-dist-upgrades
 
 plugin: user-interact-verify
-name: software/nautilus_folder_create
+id: software/nautilus_folder_create
 requires: package.name == 'nautilus'
 command: nautilus
 _description:
@@ -31,7 +31,7 @@ _description:
 Do you now have a new folder called Test Folder?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_copy
+id: software/nautilus_folder_copy
 depends: software/nautilus_folder_create
 command: nautilus
 _description:
@@ -48,7 +48,7 @@ _description:
 Do you now have a folder called Test Data?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_move
+id: software/nautilus_folder_move
 depends: software/nautilus_folder_copy
 command: nautilus
 _description:
@@ -64,7 +64,7 @@ _description:
 Was the folder called Test Data successfully moved into the folder called Test Folder?
 
 plugin: user-interact-verify
-name: software/nautilus_file_create
+id: software/nautilus_file_create
 depends: software/nautilus_folder_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -79,7 +79,7 @@ _description:
 Do you now have a file called Test File 1?
 
 plugin: user-interact-verify
-name: software/nautilus_file_copy
+id: software/nautilus_file_copy
 depends: software/nautilus_file_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -96,7 +96,7 @@ _description:
 Do you now have a file called Test File 2?
 
 plugin: user-interact-verify
-name: software/nautilus_file_move
+id: software/nautilus_file_move
 depends: software/nautilus_file_copy
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -112,7 +112,7 @@ _description:
 Was the file Test File 2 successfully moved into the Test Data folder?
 
 plugin: user-interact-verify
-name: software/nautilus_file_delete
+id: software/nautilus_file_delete
 depends: software/nautilus_file_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -127,7 +127,7 @@ _description:
 Is Test File 1 now gone?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_delete
+id: software/nautilus_folder_delete
 depends: software/nautilus_folder_create
 command: nautilus
 _description:
@@ -142,12 +142,12 @@ _description:
 Has Test Folder been successfully deleted?
 
 plugin: local
-name: software/view_office_document
+id: software/view_office_document
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
 cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/documents -type f"
- name: `basename $0`_test
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -162,12 +162,12 @@ command:
 EOF
 
 plugin: local
-name: software/audio_file_play
+id: software/audio_file_play
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
 cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/audio -type f"
- name: `basename $0`_test
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -182,12 +182,12 @@ command:
 EOF
 
 plugin: local
-name: software/video_file_play
+id: software/video_file_play
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
 cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/video -type f"
- name: `basename $0`_test
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -202,12 +202,12 @@ command:
 EOF
 
 plugin: local
-name: software/view_image_file
+id: software/view_image_file
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
 cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/images -type f"
- name: `basename $0`_test
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -222,7 +222,7 @@ command:
 EOF
 
 plugin: user-interact-verify
-name: software/firefox
+id: software/firefox
 requires: package.name == 'firefox'
 command: firefox $CHECKBOX_SHARE/data/websites/testindex.html
 _description:
@@ -234,7 +234,7 @@ _description:
 Did the Ubuntu Test page load correctly?
 
 plugin: user-interact-verify
-name: software/firefox-flash
+id: software/firefox-flash
 depends: software/firefox
 requires: package.name == 'firefox'
 command: firefox $CHECKBOX_SHARE/data/websites/flashtest.html
@@ -248,7 +248,7 @@ _description:
 Did you see the text?
 
 plugin: user-interact-verify
-name: software/firefox-flash-video
+id: software/firefox-flash-video
 depends: software/firefox-flash
 requires: package.name == 'firefox'
 command: firefox $CHECKBOX_SHARE/data/websites/flashvideo.html
@@ -262,7 +262,7 @@ _description:
 Did the video play correctly?
 
 plugin: user-interact-verify
-name: software/firefox-totem
+id: software/firefox-totem
 depends: software/firefox
 requires:
 package.name == 'firefox'
@@ -279,7 +279,7 @@ _description:
 Did the video play using a plugin?
 
 plugin: user-interact-verify
-name: software/empathy-facebook_chat
+id: software/empathy-facebook_chat
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -293,7 +293,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-google_talk
+id: software/empathy-google_talk
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -307,7 +307,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-jabber
+id: software/empathy-jabber
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -321,7 +321,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-aim
+id: software/empathy-aim
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -335,7 +335,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-msn
+id: software/empathy-msn
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -349,7 +349,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/evolution-pop3
+id: software/evolution-pop3
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -362,7 +362,7 @@ _description:
 Were you able to receive and read e-mail correctly?
 
 plugin: user-interact-verify
-name: software/evolution-imap
+id: software/evolution-imap
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -375,7 +375,7 @@ _description:
 Were you able to receive and read e-mail correctly?
 
 plugin: user-interact-verify
-name: software/evolution-smtp
+id: software/evolution-smtp
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -388,7 +388,7 @@ _description:
 Were you able to send e-mail without errors?
 
 plugin: user-interact-verify
-name: software/gcalctool
+id: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
 _description:
@@ -400,7 +400,7 @@ _description:
 Did it launch correctly?
 
 plugin: user-interact-verify
-name: software/gcalctool-functions
+id: software/gcalctool-functions
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -417,7 +417,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gcalctool-memory
+id: software/gcalctool-memory
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -434,7 +434,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gcalctool-clipboard
+id: software/gcalctool-clipboard
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -450,7 +450,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gedit
+id: software/gedit
 requires: package.name == "gedit"
 command: gedit
 _description:
@@ -463,7 +463,7 @@ _description:
 Did this perform as expected?
 
 plugin: user-interact-verify
-name: software/gedit-read
+id: software/gedit-read
 depends: software/gedit
 requires: package.name == "gedit"
 command: gedit
@@ -477,7 +477,7 @@ _description:
 Did this perform as expected?
 
 plugin: user-interact-verify
-name: software/gnome-terminal
+id: software/gnome-terminal
 requires: package.name == "gnome-terminal"
 command: gnome-terminal
 _description:
diff --git a/jobs/virtualization.txt.in b/jobs/virtualization.txt.in
index 9e19ab1..7f4b880 100644
--- a/jobs/virtualization.txt.in
+++ b/jobs/virtualization.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: virtualization/kvm_check_vm
+id: virtualization/kvm_check_vm
 user: root
 environ: http_proxy https_proxy
 requires:
@@ -11,7 +11,7 @@ _description:
 Test to check that a cloud image boots and works properly with KVM
 
 plugin: shell
-name: virtualization/xen_ok
+id: virtualization/xen_ok
 requires: package.name == 'libvirt-bin'
 user: root
 command: virsh -c xen:/// domstate Domain-0
@@ -19,7 +19,7 @@ _description:
 Test to verify that the Xen Hypervisor is running.
 
 plugin: shell
-name: virtualization/xen_check_vm
+id: virtualization/xen_check_vm
 depends: virtualization/xen_ok
 user: root
 command: xen_test /images/xentest.img /images/xentest.xml
diff --git a/jobs/wireless.txt.in b/jobs/wireless.txt.in
index f307f8f..782cd24 100644
--- a/jobs/wireless.txt.in
+++ b/jobs/wireless.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: wireless/wireless_scanning
+id: wireless/wireless_scanning
 requires:
 package.name == 'network-manager'
 device.category == 'WIRELESS'
@@ -21,7 +21,7 @@ estimated_duration: 0.645
 _description: Wireless scanning test. It scans and reports on discovered APs.
 
 plugin: shell
-name: wireless/info_automated
+id: wireless/info_automated
 requires:
 package.name == 'network-manager'
 device.category == 'WIRELESS'
@@ -31,7 +31,7 @@ _description:
 This is an automated test to gather some info on the current state of your wireless devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection
+id: wireless/wireless_connection
 command: network_check
 estimated_duration: 120.0
 requires: device.category == 'WIRELESS'
@@ -46,7 +46,7 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: shell
-name: wireless/wireless_connection_wpa_bg
+id: wireless/wireless_connection_wpa_bg
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -59,7 +59,7 @@ _description:
 security and the 802.11b/g protocols.
 
 plugin: shell
-name: wireless/wireless_connection_open_bg
+id: wireless/wireless_connection_open_bg
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -72,7 +72,7 @@ _description:
 security and the 802.11b/g protocols.
 
 plugin: shell
-name: wireless/wireless_connection_wpa_n
+id: wireless/wireless_connection_wpa_n
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -86,7 +86,7 @@ _description:
 security and the 802.11n protocol.
 
 plugin: shell
-name: wireless/wireless_connection_open_n
+id: wireless/wireless_connection_open_n
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -100,7 +100,7 @@ _description:
 security and the 802.11n protocol.
 
 plugin: shell
-name: wireless/wireless_connection_wpa_ac
+id: wireless/wireless_connection_wpa_ac
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -114,7 +114,7 @@ _description:
 security and the 802.11ac protocol.
 
 plugin: shell
-name: wireless/wireless_connection_open_ac
+id: wireless/wireless_connection_open_ac
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -128,7 +128,7 @@ _description:
 security and the 802.11ac protocol.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_wpa_bg_manual
+id: wireless/wireless_connection_wpa_bg_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -150,7 +150,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_open_bg_manual
+id: wireless/wireless_connection_open_bg_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -172,7 +172,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_wpa_n_manual
+id: wireless/wireless_connection_wpa_n_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -196,7 +196,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_open_n_manual
+id: wireless/wireless_connection_open_n_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -220,7 +220,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_wpa_ac_manual
+id: wireless/wireless_connection_wpa_ac_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -243,7 +243,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_open_ac_manual
+id: wireless/wireless_connection_open_ac_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -266,7 +266,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: shell
-name: wireless/monitor_wireless_connection
+id: wireless/monitor_wireless_connection
 requires:
 package.name == 'iperf'
 device.category == 'WIRELESS'
@@ -278,7 +278,7 @@ _description:
 Tests the performance of a systems wireless connection through the iperf tool.
 
 plugin: shell
-name: wireless/monitor_wireless_connection_udp
+id: wireless/monitor_wireless_connection_udp
 requires:
 package.name == 'iperf'
 device.category == 'WIRELESS'
@@ -290,7 +290,7 @@ _description:
 Tests the performance of a systems wireless connection through the iperf tool, using UDP packets.
 
 plugin: shell
-name: wireless/wireless_connection_open_a
+id: wireless/wireless_connection_open_a
 requires:
 device.category == 'WIRELESS'
 IEEE_80211.band_5GHz == 'supported'
@@ -304,7 +304,7 @@ _description:
 respond to requests on the 802.11a protocol.
 
 plugin: shell
-name: wireless/wireless_connection_open_b
+id: wireless/wireless_connection_open_b
 requires:
 device.category == 'WIRELESS'
 user: root
@@ -317,14 +317,14 @@ _description:
 respond to requests on the 802.11b protocol.
 
 plugin: local
-name: wireless/stress_performance
+id: wireless/stress_performance
 requires:
 device.category == 'NETWORK'
 _description: Automated test that tests performance of each wireless network device under stress.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: wireless/stress_performance_$2
+ id: wireless/stress_performance_$2
 requires: device.path == "$1"
 user: root
 command: network test -i $2 -t stress
@@ -334,7 +334,7 @@ command:
 EOF
 
 plugin: shell
-name: wireless/wireless_connection_open_g
+id: wireless/wireless_connection_open_g
 requires:
 device.category == 'WIRELESS'
 user: root
@@ -347,7 +347,7 @@ _description:
 respond to requests on the 802.11g protocol.
 
 plugin: shell
-name: wireless/wireless_extension
+id: wireless/wireless_extension
 requires: device.category == 'WIRELESS'
 command: wireless_ext
 estimated_duration: 1.2
@@ -355,13 +355,13 @@ _description:
 Test that the MAC80211 modules are loaded and wireless extensions are working.
 
 plugin: local
-name: wireless/iwconfig_info
+id: wireless/iwconfig_info
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: wireless/iwconfig_check_$2
+ id: wireless/iwconfig_check_$2
 requires: device.path == "$1"
 command: iwconfig $2
 estimated_duration: 1.2
@@ -372,7 +372,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: wireless/wireless_rfkill
+id: wireless/wireless_rfkill
 command: rfkill list | zenity --text-info --title rfkill-Info
 estimated_duration: 120.0
 requires: device.category == 'WIRELESS'
@@ -387,7 +387,7 @@ _description:
 Did the hard or soft blocks show on in the dialog?
 
 plugin: local
-name: wireless/maximum_bandwidth
+id: wireless/maximum_bandwidth
 requires:
 device.category == 'WIRELESS'
 package.name == 'zenity'
@@ -396,7 +396,7 @@ command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-verify
 user: root
- name: wireless/maximum_bandwidth_$2
+ id: wireless/maximum_bandwidth_$2
 requires: device.path == "$1"
 command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'wireless max bw $2'
 estimated_duration: 120.0