diff --git a/src/writer/hlsl/generator.cc b/src/writer/hlsl/generator.cc
index 7d4d0885e3..f0dc49a646 100644
--- a/src/writer/hlsl/generator.cc
+++ b/src/writer/hlsl/generator.cc
@@ -22,7 +22,7 @@ namespace hlsl {
 
 Generator::Generator(ast::Module module)
     : Text(std::move(module)),
-      namer_(std::make_unique<UnsafeNamer>(module_)),
+      namer_(std::make_unique<MangleNamer>(module_)),
       impl_(std::make_unique<GeneratorImpl>(module_, namer_.get())) {}
 
 Generator::Generator(ast::Module* module)
diff --git a/src/writer/msl/generator.cc b/src/writer/msl/generator.cc
index 9967928b0d..f1ec8e44c4 100644
--- a/src/writer/msl/generator.cc
+++ b/src/writer/msl/generator.cc
@@ -22,7 +22,7 @@ namespace msl {
 
 Generator::Generator(ast::Module module)
     : Text(std::move(module)),
-      namer_(std::make_unique<UnsafeNamer>(module_)),
+      namer_(std::make_unique<MangleNamer>(module_)),
       impl_(std::make_unique<GeneratorImpl>(module_, namer_.get())) {}
 
 Generator::Generator(ast::Module* module)
diff --git a/src/writer/spirv/generator.cc b/src/writer/spirv/generator.cc
index 5f83610fda..41dfb07065 100644
--- a/src/writer/spirv/generator.cc
+++ b/src/writer/spirv/generator.cc
@@ -22,7 +22,7 @@ namespace spirv {
 
 Generator::Generator(ast::Module module)
     : writer::Writer(std::move(module)),
-      namer_(std::make_unique<UnsafeNamer>(module_)),
+      namer_(std::make_unique<MangleNamer>(module_)),
       builder_(std::make_unique<Builder>(module_, namer_.get())),
       writer_(std::make_unique<BinaryWriter>()) {}