replaced id with benchmark nameHEADmaster

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

64 files changed, 64 insertions, 64 deletions

diff --git a/templates/a53_only_andbench_t1.yaml b/templates/a53_only_andbench_t1.yaml
index 4eae780..6e08ea3 100644
--- a/templates/a53_only_andbench_t1.yaml
+++ b/templates/a53_only_andbench_t1.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b01 
+        - id: andbench_t1
           name: andebench
           workload_parameters:
                 number_of_threads: 1
diff --git a/templates/a53_only_andbench_t5.yaml b/templates/a53_only_andbench_t5.yaml
index a57066b..00305c7 100644
--- a/templates/a53_only_andbench_t5.yaml
+++ b/templates/a53_only_andbench_t5.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b02 
+        - id: andbench_t5
           name: andebench
           workload_parameters:
                 number_of_threads: 5
diff --git a/templates/a53_only_antutu_4.0.3.yaml b/templates/a53_only_antutu_4.0.3.yaml
index 2688262..54a605e 100644
--- a/templates/a53_only_antutu_4.0.3.yaml
+++ b/templates/a53_only_antutu_4.0.3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b03
+        - id: antutu
           name: antutu
           label: antutu4.0.3
           workload_parameters:
diff --git a/templates/a53_only_benchmarkpi.yaml b/templates/a53_only_benchmarkpi.yaml
index c3877f9..b6e1eb8 100644
--- a/templates/a53_only_benchmarkpi.yaml
+++ b/templates/a53_only_benchmarkpi.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b04
+        - id: benchmarkpi
           name: benchmarkpi
diff --git a/templates/a53_only_caffeinemark.yaml b/templates/a53_only_caffeinemark.yaml
index b98bd32..7c0b8f9 100644
--- a/templates/a53_only_caffeinemark.yaml
+++ b/templates/a53_only_caffeinemark.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b05
+        - id: caffeinemark
           name: caffeinemark
diff --git a/templates/a53_only_cfbench.yaml b/templates/a53_only_cfbench.yaml
index 991f73d..77a9ef9 100644
--- a/templates/a53_only_cfbench.yaml
+++ b/templates/a53_only_cfbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b06
+        - id: cfbench
           name: cfbench
diff --git a/templates/a53_only_geekbench3.yaml b/templates/a53_only_geekbench3.yaml
index d2ee34d..307eeb7 100644
--- a/templates/a53_only_geekbench3.yaml
+++ b/templates/a53_only_geekbench3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b07
+        - id: geekbench3
           name: geekbench
           label: geekbench3
           workload_parameters:
diff --git a/templates/a53_only_glbenchmark_egypt_off_screen.yaml b/templates/a53_only_glbenchmark_egypt_off_screen.yaml
index 99ad54d..b223d57 100644
--- a/templates/a53_only_glbenchmark_egypt_off_screen.yaml
+++ b/templates/a53_only_glbenchmark_egypt_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b15
+        - id: glbenchmark_egypt_off_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/a53_only_glbenchmark_egypt_on_screen.yaml b/templates/a53_only_glbenchmark_egypt_on_screen.yaml
index a1e6be3..4767e69 100644
--- a/templates/a53_only_glbenchmark_egypt_on_screen.yaml
+++ b/templates/a53_only_glbenchmark_egypt_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b16
+        - id: glbenchmark_egypt_on_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/a53_only_glbenchmark_t-rex_off_screen.yaml b/templates/a53_only_glbenchmark_t-rex_off_screen.yaml
index 672a372..47c880a 100644
--- a/templates/a53_only_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/a53_only_glbenchmark_t-rex_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b17
+        - id: glbenchmark_t-rex_off_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/a53_only_glbenchmark_t-rex_on_screen.yaml b/templates/a53_only_glbenchmark_t-rex_on_screen.yaml
index ca68a3c..281178c 100644
--- a/templates/a53_only_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/a53_only_glbenchmark_t-rex_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b18
+        - id: glbenchmark_t-rex_on_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/a53_only_linpack.yaml b/templates/a53_only_linpack.yaml
index 1fbd686..558c458 100644
--- a/templates/a53_only_linpack.yaml
+++ b/templates/a53_only_linpack.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b08
+        - id: linpack
           name: linpack
diff --git a/templates/a53_only_quadrant.yaml b/templates/a53_only_quadrant.yaml
index 3793b2c..85be9d0 100644
--- a/templates/a53_only_quadrant.yaml
+++ b/templates/a53_only_quadrant.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b09
+        - id: quadrant
           name: quadrant
diff --git a/templates/a53_only_smartbench.yaml b/templates/a53_only_smartbench.yaml
index 01898fe..d6d9a31 100644
--- a/templates/a53_only_smartbench.yaml
+++ b/templates/a53_only_smartbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b10
+        - id: smartbench
           name: smartbench
diff --git a/templates/a53_only_sqlite.yaml b/templates/a53_only_sqlite.yaml
index 42838f2..ecdaa4d 100644
--- a/templates/a53_only_sqlite.yaml
+++ b/templates/a53_only_sqlite.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b11
+        - id: sqlite
           name: sqlite
diff --git a/templates/a53_only_vellamo.yaml b/templates/a53_only_vellamo.yaml
index f401346..72e170c 100644
--- a/templates/a53_only_vellamo.yaml
+++ b/templates/a53_only_vellamo.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a53_only
 workloads:
-        - id: b14
+        - id: vellamo
           name: vellamo
diff --git a/templates/a57_only_andbench_t1.yaml b/templates/a57_only_andbench_t1.yaml
index fc43cf6..fef5b1f 100644
--- a/templates/a57_only_andbench_t1.yaml
+++ b/templates/a57_only_andbench_t1.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b01 
+        - id: andbench_t1
           name: andebench
           workload_parameters:
                 number_of_threads: 1
diff --git a/templates/a57_only_andbench_t5.yaml b/templates/a57_only_andbench_t5.yaml
index 2d8f3d7..bfa41f9 100644
--- a/templates/a57_only_andbench_t5.yaml
+++ b/templates/a57_only_andbench_t5.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b02
+        - id: andbench_t5
           name: andebench
           label: andebenchst
           workload_parameters:
diff --git a/templates/a57_only_antutu_4.0.3.yaml b/templates/a57_only_antutu_4.0.3.yaml
index 3a427d4..a9ed5c9 100644
--- a/templates/a57_only_antutu_4.0.3.yaml
+++ b/templates/a57_only_antutu_4.0.3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b03
+        - id: antutu
           name: antutu
           label: antutu4.0.3
           workload_parameters:
diff --git a/templates/a57_only_benchmarkpi.yaml b/templates/a57_only_benchmarkpi.yaml
index 3747c8d..3af8231 100644
--- a/templates/a57_only_benchmarkpi.yaml
+++ b/templates/a57_only_benchmarkpi.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b04
+        - id: benchmarkpi
           name: benchmarkpi
diff --git a/templates/a57_only_caffeinemark.yaml b/templates/a57_only_caffeinemark.yaml
index b4e1c26..583464d 100644
--- a/templates/a57_only_caffeinemark.yaml
+++ b/templates/a57_only_caffeinemark.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b05
+        - id: caffeinemark
           name: caffeinemark
diff --git a/templates/a57_only_cfbench.yaml b/templates/a57_only_cfbench.yaml
index f9d0ffb..41778e1 100644
--- a/templates/a57_only_cfbench.yaml
+++ b/templates/a57_only_cfbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b06
+        - id: cfbench
           name: cfbench
diff --git a/templates/a57_only_geekbench3.yaml b/templates/a57_only_geekbench3.yaml
index 89bd922..c3435ed 100644
--- a/templates/a57_only_geekbench3.yaml
+++ b/templates/a57_only_geekbench3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b07
+        - id: geekbench3
           name: geekbench
           label: geekbench3
           workload_parameters:
diff --git a/templates/a57_only_glbenchmark_egypt_off_screen.yaml b/templates/a57_only_glbenchmark_egypt_off_screen.yaml
index 554d1b8..e38ab79 100644
--- a/templates/a57_only_glbenchmark_egypt_off_screen.yaml
+++ b/templates/a57_only_glbenchmark_egypt_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b15
+        - id: glbenchmark_egypt_off_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/a57_only_glbenchmark_egypt_on_screen.yaml b/templates/a57_only_glbenchmark_egypt_on_screen.yaml
index 107b4f2..c87c72c 100644
--- a/templates/a57_only_glbenchmark_egypt_on_screen.yaml
+++ b/templates/a57_only_glbenchmark_egypt_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b16
+        - id: glbenchmark_egypt_on_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/a57_only_glbenchmark_t-rex_off_screen.yaml b/templates/a57_only_glbenchmark_t-rex_off_screen.yaml
index 1be8abd..e90a25b 100644
--- a/templates/a57_only_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/a57_only_glbenchmark_t-rex_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only 
 workloads:
-        - id: b17
+        - id: glbenchmark_t-rex_off_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/a57_only_glbenchmark_t-rex_on_screen.yaml b/templates/a57_only_glbenchmark_t-rex_on_screen.yaml
index 5da34de..9831fcc 100644
--- a/templates/a57_only_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/a57_only_glbenchmark_t-rex_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b18
+        - id: glbenchmark_t-rex_on_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/a57_only_linpack.yaml b/templates/a57_only_linpack.yaml
index 6d6efaa..e4ecb8b 100644
--- a/templates/a57_only_linpack.yaml
+++ b/templates/a57_only_linpack.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b08
+        - id: linpack
           name: linpack
diff --git a/templates/a57_only_quadrant.yaml b/templates/a57_only_quadrant.yaml
index e53c5e8..8ebb7ce 100644
--- a/templates/a57_only_quadrant.yaml
+++ b/templates/a57_only_quadrant.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b09
+        - id: quadrant
           name: quadrant
diff --git a/templates/a57_only_smartbench.yaml b/templates/a57_only_smartbench.yaml
index 01d143b..a2c8b3f 100644
--- a/templates/a57_only_smartbench.yaml
+++ b/templates/a57_only_smartbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b10
+        - id: smartbench
           name: smartbench
diff --git a/templates/a57_only_sqlite.yaml b/templates/a57_only_sqlite.yaml
index e02add0..5164328 100644
--- a/templates/a57_only_sqlite.yaml
+++ b/templates/a57_only_sqlite.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b11
+        - id: sqlite
           name: sqlite
diff --git a/templates/a57_only_vellamo.yaml b/templates/a57_only_vellamo.yaml
index d2fb124..95ec274 100644
--- a/templates/a57_only_vellamo.yaml
+++ b/templates/a57_only_vellamo.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: a57_only
 workloads:
-        - id: b14
+        - id: vellamo
           name: vellamo
diff --git a/templates/eas_andbench_t1.yaml b/templates/eas_andbench_t1.yaml
index 83a8735..9d5f83d 100644
--- a/templates/eas_andbench_t1.yaml
+++ b/templates/eas_andbench_t1.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b01 
+        - id: andbench_t5
           name: andebench
           workload_parameters:
                 number_of_threads: 1
diff --git a/templates/eas_andbench_t5.yaml b/templates/eas_andbench_t5.yaml
index 5204663..6d08e47 100644
--- a/templates/eas_andbench_t5.yaml
+++ b/templates/eas_andbench_t5.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b01 
+        - id: andbench_t5
           name: andebench
           workload_parameters:
                 number_of_threads: 5
diff --git a/templates/eas_antutu_4.0.3.yaml b/templates/eas_antutu_4.0.3.yaml
index 57a1942..f17e4b2 100644
--- a/templates/eas_antutu_4.0.3.yaml
+++ b/templates/eas_antutu_4.0.3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b03
+        - id: antutu
           name: antutu
           label: antutu4.0.3
           workload_parameters:
diff --git a/templates/eas_benchmarkpi.yaml b/templates/eas_benchmarkpi.yaml
index f03cef9..4f466aa 100644
--- a/templates/eas_benchmarkpi.yaml
+++ b/templates/eas_benchmarkpi.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b04
+        - id: benchmarkpi
           name: benchmarkpi
diff --git a/templates/eas_caffeinemark.yaml b/templates/eas_caffeinemark.yaml
index 081dde4..f679a8e 100644
--- a/templates/eas_caffeinemark.yaml
+++ b/templates/eas_caffeinemark.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b05
+        - id: caffeinemark
           name: caffeinemark
diff --git a/templates/eas_cfbench.yaml b/templates/eas_cfbench.yaml
index deac828..773fe2a 100644
--- a/templates/eas_cfbench.yaml
+++ b/templates/eas_cfbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b06
+        - id: cfbench
           name: cfbench
diff --git a/templates/eas_geekbench3.yaml b/templates/eas_geekbench3.yaml
index ca51d83..64cf450 100644
--- a/templates/eas_geekbench3.yaml
+++ b/templates/eas_geekbench3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b07
+        - id: geekbench3
           name: geekbench
           label: geekbench3
           workload_parameters:
diff --git a/templates/eas_glbenchmark_egypt_off_screen.yaml b/templates/eas_glbenchmark_egypt_off_screen.yaml
index f2a6feb..834c93e 100644
--- a/templates/eas_glbenchmark_egypt_off_screen.yaml
+++ b/templates/eas_glbenchmark_egypt_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b15
+        - id: glbenchmark_egypt_off_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/eas_glbenchmark_egypt_on_screen.yaml b/templates/eas_glbenchmark_egypt_on_screen.yaml
index 7694a61..30ea1bc 100644
--- a/templates/eas_glbenchmark_egypt_on_screen.yaml
+++ b/templates/eas_glbenchmark_egypt_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b16
+        - id: glbenchmark_egypt_on_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/eas_glbenchmark_t-rex_off_screen.yaml b/templates/eas_glbenchmark_t-rex_off_screen.yaml
index 57870d5..399075d 100644
--- a/templates/eas_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/eas_glbenchmark_t-rex_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b17
+        - id: glbenchmark_t-rex_off_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/eas_glbenchmark_t-rex_on_screen.yaml b/templates/eas_glbenchmark_t-rex_on_screen.yaml
index 4a6b925..5449639 100644
--- a/templates/eas_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/eas_glbenchmark_t-rex_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b18
+        - id: glbenchmark_t-rex_on_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/eas_linpack.yaml b/templates/eas_linpack.yaml
index 92a325b..438a78b 100644
--- a/templates/eas_linpack.yaml
+++ b/templates/eas_linpack.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b08
+        - id: linpack
           name: linpack
diff --git a/templates/eas_quadrant.yaml b/templates/eas_quadrant.yaml
index 7d5afeb..ec08755 100644
--- a/templates/eas_quadrant.yaml
+++ b/templates/eas_quadrant.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b09
+        - id: quadrant
           name: quadrant
diff --git a/templates/eas_smartbench.yaml b/templates/eas_smartbench.yaml
index 4d40ba6..729827c 100644
--- a/templates/eas_smartbench.yaml
+++ b/templates/eas_smartbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b10
+        - id: smartbench
           name: smartbench
diff --git a/templates/eas_sqlite.yaml b/templates/eas_sqlite.yaml
index 9a24118..90fe0e8 100644
--- a/templates/eas_sqlite.yaml
+++ b/templates/eas_sqlite.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b11
+        - id: sqlite
           name: sqlite
diff --git a/templates/eas_vellamo.yaml b/templates/eas_vellamo.yaml
index 5b93a4d..b3aa05b 100644
--- a/templates/eas_vellamo.yaml
+++ b/templates/eas_vellamo.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: eas
 workloads:
-        - id: b14
+        - id: vellamo
           name: vellamo
diff --git a/templates/hmp_andbench_t1.yaml b/templates/hmp_andbench_t1.yaml
index e4bc350..63697ca 100644
--- a/templates/hmp_andbench_t1.yaml
+++ b/templates/hmp_andbench_t1.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b01 
+        - id: andbench_t1
           name: andebench
           workload_parameters:
                 number_of_threads: 1
diff --git a/templates/hmp_andbench_t5.yaml b/templates/hmp_andbench_t5.yaml
index 003d789..21a390d 100644
--- a/templates/hmp_andbench_t5.yaml
+++ b/templates/hmp_andbench_t5.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b02 
+        - id: andbench_t5
           name: andebench
           workload_parameters:
                 number_of_threads: 5
diff --git a/templates/hmp_antutu_4.0.3.yaml b/templates/hmp_antutu_4.0.3.yaml
index cc75acd..6ca559e 100644
--- a/templates/hmp_antutu_4.0.3.yaml
+++ b/templates/hmp_antutu_4.0.3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b03
+        - id: antutu
           name: antutu
           label: antutu4.0.3
           workload_parameters:
diff --git a/templates/hmp_benchmarkpi.yaml b/templates/hmp_benchmarkpi.yaml
index 100e1a5..1a2b216 100644
--- a/templates/hmp_benchmarkpi.yaml
+++ b/templates/hmp_benchmarkpi.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b04
+        - id: benchmarkpi
           name: benchmarkpi
diff --git a/templates/hmp_caffeinemark.yaml b/templates/hmp_caffeinemark.yaml
index a0f576a..bf07fc7 100644
--- a/templates/hmp_caffeinemark.yaml
+++ b/templates/hmp_caffeinemark.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b05
+        - id: caffeinemark
           name: caffeinemark
diff --git a/templates/hmp_cfbench.yaml b/templates/hmp_cfbench.yaml
index 7883a83..e8c0569 100644
--- a/templates/hmp_cfbench.yaml
+++ b/templates/hmp_cfbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b06
+        - id: cfbench
           name: cfbench
diff --git a/templates/hmp_geekbench3.yaml b/templates/hmp_geekbench3.yaml
index 986429e..15ae4d8 100644
--- a/templates/hmp_geekbench3.yaml
+++ b/templates/hmp_geekbench3.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b07
+        - id: geekbench3
           name: geekbench
           label: geekbench3
           workload_parameters:
diff --git a/templates/hmp_glbenchmark_egypt_off_screen.yaml b/templates/hmp_glbenchmark_egypt_off_screen.yaml
index 7e10743..f208d39 100644
--- a/templates/hmp_glbenchmark_egypt_off_screen.yaml
+++ b/templates/hmp_glbenchmark_egypt_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b15
+        - id: glbenchmark_egypt_off_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/hmp_glbenchmark_egypt_on_screen.yaml b/templates/hmp_glbenchmark_egypt_on_screen.yaml
index 79385a2..55d8b86 100644
--- a/templates/hmp_glbenchmark_egypt_on_screen.yaml
+++ b/templates/hmp_glbenchmark_egypt_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b16
+        - id: glbenchmark_egypt_on_screen
           name: glbenchmark
           label: egypt 2.5.1 HD
           workload_parameters:
diff --git a/templates/hmp_glbenchmark_t-rex_off_screen.yaml b/templates/hmp_glbenchmark_t-rex_off_screen.yaml
index d1ba4bb..757f821 100644
--- a/templates/hmp_glbenchmark_t-rex_off_screen.yaml
+++ b/templates/hmp_glbenchmark_t-rex_off_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b17
+        - id: glbenchmark_t-rex_off_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/hmp_glbenchmark_t-rex_on_screen.yaml b/templates/hmp_glbenchmark_t-rex_on_screen.yaml
index b8e5f1a..0e8e360 100644
--- a/templates/hmp_glbenchmark_t-rex_on_screen.yaml
+++ b/templates/hmp_glbenchmark_t-rex_on_screen.yaml
@@ -6,7 +6,7 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b18
+        - id: glbenchmark_t-rex_on_screen
           name: glbenchmark
           label: t-rex 2.7.0 HD
           workload_parameters:
diff --git a/templates/hmp_linpack.yaml b/templates/hmp_linpack.yaml
index 1533cdd..27bcc8e 100644
--- a/templates/hmp_linpack.yaml
+++ b/templates/hmp_linpack.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b08
+        - id: linpack
           name: linpack
diff --git a/templates/hmp_quadrant.yaml b/templates/hmp_quadrant.yaml
index a6249ce..49854eb 100644
--- a/templates/hmp_quadrant.yaml
+++ b/templates/hmp_quadrant.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b09
+        - id: quadrant
           name: quadrant
diff --git a/templates/hmp_smartbench.yaml b/templates/hmp_smartbench.yaml
index d2b39d9..35a564d 100644
--- a/templates/hmp_smartbench.yaml
+++ b/templates/hmp_smartbench.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b10
+        - id: smartbench
           name: smartbench
diff --git a/templates/hmp_sqlite.yaml b/templates/hmp_sqlite.yaml
index f75fb23..d148529 100644
--- a/templates/hmp_sqlite.yaml
+++ b/templates/hmp_sqlite.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b11
+        - id: sqlite
           name: sqlite
diff --git a/templates/hmp_vellamo.yaml b/templates/hmp_vellamo.yaml
index 342e4b7..05d17ad 100644
--- a/templates/hmp_vellamo.yaml
+++ b/templates/hmp_vellamo.yaml
@@ -6,5 +6,5 @@ global:
 sections:
         - id: hmp
 workloads:
-        - id: b14
+        - id: vellamo
           name: vellamo