diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc
index ae98f19aa8..7957c85aae 100644
--- a/src/inspector/inspector.cc
+++ b/src/inspector/inspector.cc
@@ -48,7 +48,7 @@ Inspector::Inspector(ast::Module& module, Namer* namer)
 
 Inspector::Inspector(ast::Module& module)
     : module_(module),
-      namer_(new UnsafeNamer(&module)),
+      namer_(new MangleNamer(&module)),
       namer_is_owned_(true) {}
 
 Inspector::~Inspector() {
diff --git a/src/writer/hlsl/generator.cc b/src/writer/hlsl/generator.cc
index c7565fc3d1..7d4d0885e3 100644
--- a/src/writer/hlsl/generator.cc
+++ b/src/writer/hlsl/generator.cc
@@ -27,7 +27,7 @@ Generator::Generator(ast::Module module)
 
 Generator::Generator(ast::Module* module)
     : Text(module),
-      namer_(std::make_unique<UnsafeNamer>(module_)),
+      namer_(std::make_unique<MangleNamer>(module_)),
       impl_(std::make_unique<GeneratorImpl>(module_, namer_.get())) {}
 
 Generator::~Generator() = default;
diff --git a/src/writer/msl/generator.cc b/src/writer/msl/generator.cc
index 7041d62e3f..9967928b0d 100644
--- a/src/writer/msl/generator.cc
+++ b/src/writer/msl/generator.cc
@@ -27,7 +27,7 @@ Generator::Generator(ast::Module module)
 
 Generator::Generator(ast::Module* module)
     : Text(module),
-      namer_(std::make_unique<UnsafeNamer>(module_)),
+      namer_(std::make_unique<MangleNamer>(module_)),
       impl_(std::make_unique<GeneratorImpl>(module_, namer_.get())) {}
 
 Generator::~Generator() = default;
diff --git a/src/writer/spirv/generator.cc b/src/writer/spirv/generator.cc
index 434c5b0e0d..5f83610fda 100644
--- a/src/writer/spirv/generator.cc
+++ b/src/writer/spirv/generator.cc
@@ -28,7 +28,7 @@ Generator::Generator(ast::Module module)
 
 Generator::Generator(ast::Module* module)
     : writer::Writer(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>()) {}