diff --git a/libs/devlib b/libs/devlib
index f52ac6650df7f6040c5a709495d7d87f9ad7118e..724c0ec8dfc6da8f87d253ebd8020ad35b0ab347 160000
--- a/libs/devlib
+++ b/libs/devlib
@@ -1 +1 @@
-Subproject commit f52ac6650df7f6040c5a709495d7d87f9ad7118e
+Subproject commit 724c0ec8dfc6da8f87d253ebd8020ad35b0ab347
diff --git a/tools/wltests/agendas/sched-evaluation-full-traced.yaml b/tools/wltests/agendas/sched-evaluation-full-traced.yaml
index 079e07a34ac3e117e5e64905e5fe5e1137cb2475..8e47901d2198ad84cdd9ff91a587e9c3e787431b 100644
--- a/tools/wltests/agendas/sched-evaluation-full-traced.yaml
+++ b/tools/wltests/agendas/sched-evaluation-full-traced.yaml
@@ -53,7 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
-    id: exoplayer-mov720_30s
+    id: exoplayer_mov720_30s
     classifiers:
        tag: mov_720p_30s
     workload_parameters:
@@ -62,7 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
-    id: exoplayer-ogg_128kbps_30s
+    id: exoplayer_ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_30s
     workload_parameters:
@@ -93,7 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
-    id: jankbench-list_view
+    id: jankbench_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -101,7 +101,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-image_list_view
+    id: jankbench_image_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -109,7 +109,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-shadow_grid
+    id: jankbench_shadow_grid
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -117,7 +117,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-      test: jankbench-low_hitrate_text
+      test: jankbench_low_hitrate_text
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -125,10 +125,9 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-edit_text
+    id: jankbench_edit_text
     classifiers:
       tag: iter_30
     workload_parameters:
       test: edit_text
     iterations: 30
-
diff --git a/tools/wltests/agendas/sched-evaluation-full.yaml b/tools/wltests/agendas/sched-evaluation-full.yaml
index ab0b9e0a42f6bea24bec4dca27d2991d740ce0c5..98a4863e2e615854d517e63a6d6d909116084b93 100644
--- a/tools/wltests/agendas/sched-evaluation-full.yaml
+++ b/tools/wltests/agendas/sched-evaluation-full.yaml
@@ -53,7 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
-    id: exoplayer-mov720_30s
+    id: exoplayer_mov720_30s
     classifiers:
        tag: mov_720p_30s
     workload_parameters:
@@ -62,7 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
-    id: exoplayer-ogg_128kbps_30s
+    id: exoplayer_ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_30s
     workload_parameters:
@@ -93,7 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
-    id: jankbench-list_view
+    id: jankbench_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -101,7 +101,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-image_list_view
+    id: jankbench_image_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -109,7 +109,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-shadow_grid
+    id: jankbench_shadow_grid
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -117,7 +117,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-low_hitrate_text
+    id: jankbench_low_hitrate_text
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -125,10 +125,9 @@ workloads:
     iterations: 30
 
   - name: jankbench
-    id: jankbench-edit_text
+    id: jankbench_edit_text
     classifiers:
       tag: iter_30
     workload_parameters:
       test: edit_text
     iterations: 30
-
diff --git a/tools/wltests/agendas/sched-evaluation-small.yaml b/tools/wltests/agendas/sched-evaluation-small.yaml
index 9861eba0cf9852b317f74264eb468a56a218e8bc..542ddcc208164250542b72d22d0462a638787386 100644
--- a/tools/wltests/agendas/sched-evaluation-small.yaml
+++ b/tools/wltests/agendas/sched-evaluation-small.yaml
@@ -53,7 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
-    id: exoplayer-mov720_30s
+    id: exoplayer_mov720_30s
     classifiers:
        tag: mov_720p_3s
     workload_parameters:
@@ -62,7 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
-    id: exoplayer-ogg_128kbps_30s
+    id: exoplayer_ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_3s
     workload_parameters:
@@ -93,7 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
-    id: jankbench-list_view
+    id: jankbench_list_view
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -101,7 +101,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
-    id: jankbench-image_list_view
+    id: jankbench_image_list_view
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -109,7 +109,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
-    id: jankbench-shadow_grid
+    id: jankbench_shadow_grid
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -117,7 +117,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
-    id: jankbench-low_hitrate_text
+    id: jankbench_low_hitrate_text
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -125,10 +125,9 @@ workloads:
     iterations: 3
 
   - name: jankbench
-    id: jankbench-edit_text
+    id: jankbench_edit_text
     classifiers:
       tag: iter_3
     workload_parameters:
       test: edit_text
     iterations: 3
-
diff --git a/tools/workload-automation b/tools/workload-automation
index 12edabf753d81fb18fbcade7bae6b76ec3e075e2..f9df5195b966366e367725f89ab4234120e3094a 160000
--- a/tools/workload-automation
+++ b/tools/workload-automation
@@ -1 +1 @@
-Subproject commit 12edabf753d81fb18fbcade7bae6b76ec3e075e2
+Subproject commit f9df5195b966366e367725f89ab4234120e3094a