1 files changed, 15 insertions, 11 deletions
diff --git a/testing/web-platform/tests/html/canvas/tools/yaml-new/shadows.yaml b/testing/web-platform/tests/html/canvas/tools/yaml-new/shadows.yaml
index 953ab2c555..e42237dadb 100644
--- a/testing/web-platform/tests/html/canvas/tools/yaml-new/shadows.yaml
+++ b/testing/web-platform/tests/html/canvas/tools/yaml-new/shadows.yaml
@@ -136,7 +136,7 @@
 
 - name: 2d.shadow.attributes.shadowColor.current.basic
   desc: currentColor is computed from the canvas element
-  canvasType: ['HtmlCanvas']
+  canvas_types: ['HtmlCanvas']
   code: |
     canvas.style.color = '#0f0';
     ctx.shadowColor = 'currentColor';
@@ -144,7 +144,7 @@
 
 - name: 2d.shadow.attributes.shadowColor.current.changed
   desc: currentColor is computed when the attribute is set, not when it is painted
-  canvasType: ['HtmlCanvas']
+  canvas_types: ['HtmlCanvas']
   code: |
     canvas.style.color = '#0f0';
     ctx.shadowColor = 'currentColor';
@@ -153,7 +153,7 @@
 
 - name: 2d.shadow.attributes.shadowColor.current.removed
   desc: currentColor is solid black when the canvas element is not in a document
-  canvasType: ['HtmlCanvas']
+  canvas_types: ['HtmlCanvas']
   code: |
     // Try not to let it undetectably incorrectly pick up opaque-black
     // from other parts of the document:
@@ -518,11 +518,13 @@
     @assert pixel 50,25 == 0,255,0,255;
   expected: green
   variants: &load-image-variant-definition
-    _HtmlCanvas:
-      canvasType: ['HtmlCanvas']
+  - HtmlCanvas:
+      append_variants_to_name: false
+      canvas_types: ['HtmlCanvas']
       load_image: var img = document.getElementById('{{ images[0] }}');
-    _OffscreenCanvas:
-      canvasType: ['OffscreenCanvas', 'Worker']
+    OffscreenCanvas:
+      append_variants_to_name: false
+      canvas_types: ['OffscreenCanvas', 'Worker']
       test_type: promise
       load_image: |-
         var response = await fetch('/images/{{ images[0] }}')
@@ -640,14 +642,16 @@
     @assert pixel 50,25 == 0,255,0,255;
   expected: green
   variants: &create-canvas2-variant-definition
-    _HtmlCanvas:
-      canvasType: ['HtmlCanvas']
+  - HtmlCanvas:
+      append_variants_to_name: false
+      canvas_types: ['HtmlCanvas']
       create_canvas2: |-
         var canvas2 = document.createElement('canvas');
         canvas2.width = 100;
         canvas2.height = 50;
-    _OffscreenCanvas:
-      canvasType: ['OffscreenCanvas', 'Worker']
+    OffscreenCanvas:
+      append_variants_to_name: false
+      canvas_types: ['OffscreenCanvas', 'Worker']
       create_canvas2: |-
         var canvas2 = new OffscreenCanvas(100, 50);