diff --git a/src/resolver/assignment_validation_test.cc b/src/resolver/assignment_validation_test.cc
index 1691864380..f8d93904b3 100644
--- a/src/resolver/assignment_validation_test.cc
+++ b/src/resolver/assignment_validation_test.cc
@@ -294,7 +294,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignNonConstructible_RuntimeArray) {
 }
 
 TEST_F(ResolverAssignmentValidationTest,
-       AssignToPhony_NonConstructableStruct_Fail) {
+       AssignToPhony_NonConstructibleStruct_Fail) {
   // [[block]]
   // struct S {
   //   arr: array<i32>;
@@ -311,7 +311,7 @@ TEST_F(ResolverAssignmentValidationTest,
   EXPECT_FALSE(r()->Resolve());
   EXPECT_EQ(r()->error(),
             "12:34 error: cannot assign 'S' to '_'. "
-            "'_' can only be assigned a constructable, pointer, texture or "
+            "'_' can only be assigned a constructible, pointer, texture or "
             "sampler type");
 }
 
@@ -333,7 +333,7 @@ TEST_F(ResolverAssignmentValidationTest, AssignToPhony_DynamicArray_Fail) {
   EXPECT_EQ(
       r()->error(),
       "12:34 error: cannot assign 'ref<storage, array<i32>, read>' to '_'. "
-      "'_' can only be assigned a constructable, pointer, texture or sampler "
+      "'_' can only be assigned a constructible, pointer, texture or sampler "
       "type");
 }
 
diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 1553999e6b..b86103cad4 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -4433,7 +4433,7 @@ bool Resolver::ValidateAssignment(const ast::AssignmentStatement* a) {
         !ty->IsAnyOf<sem::Pointer, sem::Texture, sem::Sampler>()) {
       AddError(
           "cannot assign '" + TypeNameOf(a->rhs) +
-              "' to '_'. '_' can only be assigned a constructable, pointer, "
+              "' to '_'. '_' can only be assigned a constructible, pointer, "
               "texture or sampler type",
           a->rhs->source);
       return false;
diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc
index dd287de1a9..631476c852 100644
--- a/src/writer/hlsl/generator_impl.cc
+++ b/src/writer/hlsl/generator_impl.cc
@@ -146,7 +146,7 @@ SanitizedResult Sanitize(const Program* in,
   // * Simplify, as we need to fold away the address-of and dereferences of
   // `*(&(intrinsic_load()))` expressions.
   // * RemovePhonies, as phonies can be assigned a pointer to a
-  //   non-constructable buffer, or dynamic array, which DMA cannot cope with.
+  //   non-constructible buffer, or dynamic array, which DMA cannot cope with.
   manager.Add<transform::DecomposeMemoryAccess>();
   // CalculateArrayLength must come after DecomposeMemoryAccess, as
   // DecomposeMemoryAccess special-cases the arrayLength() intrinsic, which
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 085a8dc676..5ddd765df5 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -307,6 +307,7 @@ tint_unittests_source_set("tint_unittests_core_src") {
     "../src/transform/num_workgroups_from_uniform_test.cc",
     "../src/transform/pad_array_elements_test.cc",
     "../src/transform/promote_initializers_to_const_var_test.cc",
+    "../src/transform/remove_phonies_test.cc",
     "../src/transform/renamer_test.cc",
     "../src/transform/robustness_test.cc",
     "../src/transform/simplify_test.cc",