diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
index 5332623073..e7395cf77a 100644
--- a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
+++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
@@ -380,7 +380,7 @@ namespace dawn_native { namespace d3d12 {
             tint::transform::DataMap transformInputs;
 
             if (request.isRobustnessEnabled) {
-                transformManager.Add<tint::transform::BoundArrayAccessors>();
+                transformManager.Add<tint::transform::Robustness>();
             }
             transformManager.Add<tint::transform::BindingRemapper>();
 
diff --git a/src/dawn_native/metal/ShaderModuleMTL.mm b/src/dawn_native/metal/ShaderModuleMTL.mm
index 1ba4ee695c..c994ceef90 100644
--- a/src/dawn_native/metal/ShaderModuleMTL.mm
+++ b/src/dawn_native/metal/ShaderModuleMTL.mm
@@ -118,7 +118,7 @@ namespace dawn_native { namespace metal {
             }
         }
         if (GetDevice()->IsRobustnessEnabled()) {
-            transformManager.Add<tint::transform::BoundArrayAccessors>();
+            transformManager.Add<tint::transform::Robustness>();
         }
         transformManager.Add<tint::transform::BindingRemapper>();
         transformManager.Add<tint::transform::Renamer>();
diff --git a/src/dawn_native/vulkan/ShaderModuleVk.cpp b/src/dawn_native/vulkan/ShaderModuleVk.cpp
index cbc004b596..9cad708689 100644
--- a/src/dawn_native/vulkan/ShaderModuleVk.cpp
+++ b/src/dawn_native/vulkan/ShaderModuleVk.cpp
@@ -84,13 +84,12 @@ namespace dawn_native { namespace vulkan {
         if (GetDevice()->IsRobustnessEnabled()) {
             ScopedTintICEHandler scopedICEHandler(GetDevice());
 
-            tint::transform::BoundArrayAccessors boundArrayAccessors;
+            tint::transform::Robustness robustness;
             tint::transform::DataMap transformInputs;
 
             tint::Program program;
-            DAWN_TRY_ASSIGN(program,
-                            RunTransforms(&boundArrayAccessors, parseResult->tintProgram.get(),
-                                          transformInputs, nullptr, nullptr));
+            DAWN_TRY_ASSIGN(program, RunTransforms(&robustness, parseResult->tintProgram.get(),
+                                                   transformInputs, nullptr, nullptr));
             // Rather than use a new ParseResult object, we just reuse the original parseResult
             parseResult->tintProgram = std::make_unique<tint::Program>(std::move(program));
         }