tint: Rename 'type' to 'alias'

Bug: tint:1812
Change-Id: I50bd8b036b47b4ec223a81eda53bd658d19645e9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117211
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
diff --git a/docs/tint/origin-trial-changes.md b/docs/tint/origin-trial-changes.md
index fdf16b0..a4f1cbc 100644
--- a/docs/tint/origin-trial-changes.md
+++ b/docs/tint/origin-trial-changes.md
@@ -1,5 +1,11 @@
 # Tint changes during Origin Trial
 
+## Changes for M111
+
+## Deprecated Features
+
+* The keyword to alias a type has been renamed from `type` to `alias`. [tint:1812](crbug.com/tint/1812)
+
 ## Changes for M110
 
 ### Breaking changes
diff --git a/src/tint/reader/spirv/function_memory_test.cc b/src/tint/reader/spirv/function_memory_test.cc
index 0ff9ba5..1877725 100644
--- a/src/tint/reader/spirv/function_memory_test.cc
+++ b/src/tint/reader/spirv/function_memory_test.cc
@@ -950,7 +950,7 @@
     auto p = parser(test::Assemble(assembly));
     ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << assembly << p->error();
     const auto module_str = test::ToString(p->program());
-    EXPECT_THAT(module_str, HasSubstr(R"(type RTArr = @stride(4) array<u32>;
+    EXPECT_THAT(module_str, HasSubstr(R"(alias RTArr = @stride(4) array<u32>;
 
 struct S {
   /* @offset(0) */
diff --git a/src/tint/reader/spirv/parser_impl_module_var_test.cc b/src/tint/reader/spirv/parser_impl_module_var_test.cc
index 7543792..5077a51 100644
--- a/src/tint/reader/spirv/parser_impl_module_var_test.cc
+++ b/src/tint/reader/spirv/parser_impl_module_var_test.cc
@@ -1251,7 +1251,7 @@
     ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions());
     EXPECT_TRUE(p->error().empty());
     const auto module_str = test::ToString(p->program());
-    EXPECT_THAT(module_str, HasSubstr(R"(type Arr = @stride(4) array<u32, 2u>;
+    EXPECT_THAT(module_str, HasSubstr(R"(alias Arr = @stride(4) array<u32, 2u>;
 
 struct S {
   /* @offset(0) */
@@ -2424,13 +2424,13 @@
     ASSERT_TRUE(p->BuildAndParseInternalModule()) << p->error() << assembly;
     EXPECT_TRUE(p->error().empty());
     const auto module_str = test::ToString(p->program());
-    const std::string expected = R"(type Arr = @stride(4) array<u32, 1u>;
+    const std::string expected = R"(alias Arr = @stride(4) array<u32, 1u>;
 
-type Arr_1 = @stride(4) array<u32, 2u>;
+alias Arr_1 = @stride(4) array<u32, 2u>;
 
-type Arr_2 = @stride(4) array<i32, 1u>;
+alias Arr_2 = @stride(4) array<i32, 1u>;
 
-type Arr_3 = @stride(4) array<i32, 2u>;
+alias Arr_3 = @stride(4) array<i32, 2u>;
 
 var<private> x_1 : Arr;
 
@@ -2463,13 +2463,13 @@
     ASSERT_TRUE(p->BuildAndParseInternalModule()) << p->error() << assembly;
     EXPECT_TRUE(p->error().empty());
     const auto module_str = test::ToString(p->program());
-    const std::string expected = R"(type Arr = @stride(4) array<u32, 1u>;
+    const std::string expected = R"(alias Arr = @stride(4) array<u32, 1u>;
 
-type Arr_1 = @stride(4) array<u32, 2u>;
+alias Arr_1 = @stride(4) array<u32, 2u>;
 
-type Arr_2 = @stride(4) array<i32, 1u>;
+alias Arr_2 = @stride(4) array<i32, 1u>;
 
-type Arr_3 = @stride(4) array<i32, 2u>;
+alias Arr_3 = @stride(4) array<i32, 2u>;
 
 var<private> x_1 : Arr;
 
diff --git a/src/tint/reader/spirv/parser_impl_named_types_test.cc b/src/tint/reader/spirv/parser_impl_named_types_test.cc
index 3fb07a4..2b29fbe 100644
--- a/src/tint/reader/spirv/parser_impl_named_types_test.cc
+++ b/src/tint/reader/spirv/parser_impl_named_types_test.cc
@@ -89,9 +89,9 @@
     %arr2 = OpTypeRuntimeArray %uint
   )"));
     EXPECT_TRUE(p->BuildAndParseInternalModule());
-    EXPECT_THAT(test::ToString(p->program()), HasSubstr(R"(type RTArr = @stride(8) array<u32>;
+    EXPECT_THAT(test::ToString(p->program()), HasSubstr(R"(alias RTArr = @stride(8) array<u32>;
 
-type RTArr_1 = @stride(8) array<u32>;
+alias RTArr_1 = @stride(8) array<u32>;
 )"));
 
     p->DeliberatelyInvalidSpirv();
@@ -135,9 +135,9 @@
     %arr2 = OpTypeArray %uint %uint_5
   )"));
     EXPECT_TRUE(p->BuildAndParseInternalModule());
-    EXPECT_THAT(test::ToString(p->program()), HasSubstr(R"(type Arr = @stride(8) array<u32, 5u>;
+    EXPECT_THAT(test::ToString(p->program()), HasSubstr(R"(alias Arr = @stride(8) array<u32, 5u>;
 
-type Arr_1 = @stride(8) array<u32, 5u>;
+alias Arr_1 = @stride(8) array<u32, 5u>;
 )"));
 
     p->DeliberatelyInvalidSpirv();
diff --git a/src/tint/reader/wgsl/lexer.cc b/src/tint/reader/wgsl/lexer.cc
index 6371db7..1513555 100644
--- a/src/tint/reader/wgsl/lexer.cc
+++ b/src/tint/reader/wgsl/lexer.cc
@@ -1115,6 +1115,9 @@
 }
 
 Token Lexer::check_keyword(const Source& source, std::string_view str) {
+    if (str == "alias") {
+        return {Token::Type::kAlias, source, "alias"};
+    }
     if (str == "array") {
         return {Token::Type::kArray, source, "array"};
     }
diff --git a/src/tint/reader/wgsl/lexer_test.cc b/src/tint/reader/wgsl/lexer_test.cc
index a1a4764..c7ab809 100644
--- a/src/tint/reader/wgsl/lexer_test.cc
+++ b/src/tint/reader/wgsl/lexer_test.cc
@@ -1057,7 +1057,8 @@
 INSTANTIATE_TEST_SUITE_P(
     LexerTest,
     KeywordTest,
-    testing::Values(TokenData{"array", Token::Type::kArray},
+    testing::Values(TokenData{"alias", Token::Type::kAlias},
+                    TokenData{"array", Token::Type::kArray},
                     TokenData{"bitcast", Token::Type::kBitcast},
                     TokenData{"bool", Token::Type::kBool},
                     TokenData{"break", Token::Type::kBreak},
diff --git a/src/tint/reader/wgsl/parser_impl.cc b/src/tint/reader/wgsl/parser_impl.cc
index 620dc1e..7b303d1 100644
--- a/src/tint/reader/wgsl/parser_impl.cc
+++ b/src/tint/reader/wgsl/parser_impl.cc
@@ -1008,13 +1008,18 @@
 }
 
 // type_alias_decl
-//   : TYPE IDENT EQUAL type_specifier
+//   : ALIAS IDENT EQUAL type_specifier
 Maybe<const ast::Alias*> ParserImpl::type_alias_decl() {
-    if (!peek_is(Token::Type::kType)) {
+    Source source;
+    if (match(Token::Type::kAlias, &source)) {
+        // matched.
+    } else if (match(Token::Type::kType, &source)) {
+        // TODO(crbug.com/tint/1812): DEPRECATED
+        deprecated(source, "'type' has been renamed to 'alias'");
+    } else {
         return Failure::kNoMatch;
     }
 
-    auto& t = next();
     const char* use = "type alias";
 
     auto name = expect_ident(use);
@@ -1034,7 +1039,7 @@
         return add_error(peek(), "invalid type alias");
     }
 
-    return builder_.ty.alias(make_source_range_from(t.source()), name.value, type.value);
+    return builder_.ty.alias(make_source_range_from(source), name.value, type.value);
 }
 
 // vec_prefix
diff --git a/src/tint/reader/wgsl/parser_impl_error_msg_test.cc b/src/tint/reader/wgsl/parser_impl_error_msg_test.cc
index ff077ab8..3224252 100644
--- a/src/tint/reader/wgsl/parser_impl_error_msg_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_error_msg_test.cc
@@ -52,8 +52,13 @@
 }
 
 TEST_F(ParserImplErrorTest, AliasDeclInvalidAttribute) {
-    EXPECT("@invariant type e=u32;",
-           R"(test.wgsl:1:2 error: unexpected attributes
+    EXPECT(
+        "@invariant type e=u32;",
+        R"(test.wgsl:1:12 warning: use of deprecated language feature: 'type' has been renamed to 'alias'
+@invariant type e=u32;
+           ^^^^
+
+test.wgsl:1:2 error: unexpected attributes
 @invariant type e=u32;
  ^^^^^^^^^
 )");
@@ -745,29 +750,80 @@
 }
 
 TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasMissingIdentifier) {
-    EXPECT("type 1 = f32;",
-           R"(test.wgsl:1:6 error: expected identifier for type alias
-type 1 = f32;
-     ^
+    EXPECT("alias 1 = f32;",
+           R"(test.wgsl:1:7 error: expected identifier for type alias
+alias 1 = f32;
+      ^
 )");
 }
 
 TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasInvalidType) {
-    EXPECT("type meow = 1;", R"(test.wgsl:1:13 error: invalid type alias
+    EXPECT("alias meow = 1;", R"(test.wgsl:1:14 error: invalid type alias
+alias meow = 1;
+             ^
+)");
+}
+
+TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasMissingAssignment) {
+    EXPECT("alias meow f32", R"(test.wgsl:1:12 error: expected '=' for type alias
+alias meow f32
+           ^^^
+)");
+}
+
+TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasMissingSemicolon) {
+    EXPECT("alias meow = f32", R"(test.wgsl:1:17 error: expected ';' for type alias
+alias meow = f32
+                ^
+)");
+}
+
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplErrorTest, DEPRECATED_GlobalDeclTypeAliasMissingIdentifier) {
+    EXPECT("alias 1 = f32;",
+           R"(test.wgsl:1:7 error: expected identifier for type alias
+alias 1 = f32;
+      ^
+)");
+}
+
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplErrorTest, DEPRECATED_GlobalDeclTypeAliasInvalidType) {
+    EXPECT(
+        "type meow = 1;",
+        R"(test.wgsl:1:1 warning: use of deprecated language feature: 'type' has been renamed to 'alias'
+type meow = 1;
+^^^^
+
+test.wgsl:1:13 error: invalid type alias
 type meow = 1;
             ^
 )");
 }
 
-TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasMissingAssignment) {
-    EXPECT("type meow f32", R"(test.wgsl:1:11 error: expected '=' for type alias
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplErrorTest, DEPRECATED_GlobalDeclTypeAliasMissingAssignment) {
+    EXPECT(
+        "type meow f32",
+        R"(test.wgsl:1:1 warning: use of deprecated language feature: 'type' has been renamed to 'alias'
+type meow f32
+^^^^
+
+test.wgsl:1:11 error: expected '=' for type alias
 type meow f32
           ^^^
 )");
 }
 
-TEST_F(ParserImplErrorTest, GlobalDeclTypeAliasMissingSemicolon) {
-    EXPECT("type meow = f32", R"(test.wgsl:1:16 error: expected ';' for type alias
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplErrorTest, DEPRECATED_GlobalDeclTypeAliasMissingSemicolon) {
+    EXPECT(
+        "type meow = f32",
+        R"(test.wgsl:1:1 warning: use of deprecated language feature: 'type' has been renamed to 'alias'
+type meow = f32
+^^^^
+
+test.wgsl:1:16 error: expected ';' for type alias
 type meow = f32
                ^
 )");
diff --git a/src/tint/reader/wgsl/parser_impl_global_decl_test.cc b/src/tint/reader/wgsl/parser_impl_global_decl_test.cc
index 2f124d5..d6d32e0 100644
--- a/src/tint/reader/wgsl/parser_impl_global_decl_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_global_decl_test.cc
@@ -99,7 +99,7 @@
 }
 
 TEST_F(ParserImplTest, GlobalDecl_TypeAlias) {
-    auto p = parser("type A = i32;");
+    auto p = parser("alias A = i32;");
     p->global_decl();
     ASSERT_FALSE(p->has_error()) << p->error();
 
@@ -113,6 +113,42 @@
     auto p = parser(R"(struct A {
   a : f32,
 }
+alias B = A;)");
+    p->global_decl();
+    p->global_decl();
+    ASSERT_FALSE(p->has_error()) << p->error();
+
+    auto program = p->program();
+    ASSERT_EQ(program.AST().TypeDecls().Length(), 2u);
+    ASSERT_TRUE(program.AST().TypeDecls()[0]->Is<ast::Struct>());
+    auto* str = program.AST().TypeDecls()[0]->As<ast::Struct>();
+    EXPECT_EQ(str->name, program.Symbols().Get("A"));
+
+    ASSERT_TRUE(program.AST().TypeDecls()[1]->Is<ast::Alias>());
+    auto* alias = program.AST().TypeDecls()[1]->As<ast::Alias>();
+    EXPECT_EQ(alias->name, program.Symbols().Get("B"));
+    auto* tn = alias->type->As<ast::TypeName>();
+    EXPECT_NE(tn, nullptr);
+    EXPECT_EQ(tn->name, str->name);
+}
+
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplTest, DEPRECATED_GlobalDecl_TypeAlias) {
+    auto p = parser("type A = i32;");
+    p->global_decl();
+    ASSERT_FALSE(p->has_error()) << p->error();
+
+    auto program = p->program();
+    ASSERT_EQ(program.AST().TypeDecls().Length(), 1u);
+    ASSERT_TRUE(program.AST().TypeDecls()[0]->Is<ast::Alias>());
+    EXPECT_EQ(program.Symbols().NameFor(program.AST().TypeDecls()[0]->As<ast::Alias>()->name), "A");
+}
+
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplTest, DEPRECATED_GlobalDecl_TypeAlias_StructIdent) {
+    auto p = parser(R"(struct A {
+  a : f32,
+}
 type B = A;)");
     p->global_decl();
     p->global_decl();
@@ -133,10 +169,20 @@
 }
 
 TEST_F(ParserImplTest, GlobalDecl_TypeAlias_MissingSemicolon) {
+    auto p = parser("alias A = i32");
+    p->global_decl();
+    ASSERT_TRUE(p->has_error());
+    EXPECT_EQ(p->error(), "1:14: expected ';' for type alias");
+}
+
+// TODO(crbug.com/tint/1812): DEPRECATED
+TEST_F(ParserImplTest, DEPRECATED_GlobalDecl_TypeAlias_MissingSemicolon) {
     auto p = parser("type A = i32");
     p->global_decl();
     ASSERT_TRUE(p->has_error());
-    EXPECT_EQ(p->error(), "1:13: expected ';' for type alias");
+    EXPECT_EQ(p->error(),
+              R"(1:1: use of deprecated language feature: 'type' has been renamed to 'alias'
+1:13: expected ';' for type alias)");
 }
 
 TEST_F(ParserImplTest, GlobalDecl_Function) {
diff --git a/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc b/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
index f2adc06..c20302d 100644
--- a/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_reserved_keyword_test.cc
@@ -78,10 +78,10 @@
 }
 TEST_P(ParserImplReservedKeywordTest, Alias) {
     auto name = GetParam();
-    auto p = parser("type " + name + " = i32;");
+    auto p = parser("alias " + name + " = i32;");
     EXPECT_FALSE(p->Parse());
     EXPECT_TRUE(p->has_error());
-    EXPECT_EQ(p->error(), "1:6: '" + name + "' is a reserved keyword");
+    EXPECT_EQ(p->error(), "1:7: '" + name + "' is a reserved keyword");
 }
 INSTANTIATE_TEST_SUITE_P(ParserImplReservedKeywordTest,
                          ParserImplReservedKeywordTest,
diff --git a/src/tint/reader/wgsl/parser_impl_type_alias_test.cc b/src/tint/reader/wgsl/parser_impl_type_alias_test.cc
index c9bb72c..f4c20de 100644
--- a/src/tint/reader/wgsl/parser_impl_type_alias_test.cc
+++ b/src/tint/reader/wgsl/parser_impl_type_alias_test.cc
@@ -73,7 +73,9 @@
     EXPECT_FALSE(t.matched);
     EXPECT_TRUE(p->has_error());
     EXPECT_EQ(t.value, nullptr);
-    EXPECT_EQ(p->error(), "1:6: expected identifier for type alias");
+    EXPECT_EQ(p->error(),
+              R"(1:1: use of deprecated language feature: 'type' has been renamed to 'alias'
+1:6: expected identifier for type alias)");
 }
 
 TEST_F(ParserImplTest, TypeDecl_InvalidIdent) {
@@ -83,7 +85,9 @@
     EXPECT_FALSE(t.matched);
     EXPECT_TRUE(p->has_error());
     EXPECT_EQ(t.value, nullptr);
-    EXPECT_EQ(p->error(), "1:6: expected identifier for type alias");
+    EXPECT_EQ(p->error(),
+              R"(1:1: use of deprecated language feature: 'type' has been renamed to 'alias'
+1:6: expected identifier for type alias)");
 }
 
 TEST_F(ParserImplTest, TypeDecl_MissingEqual) {
@@ -93,7 +97,9 @@
     EXPECT_FALSE(t.matched);
     EXPECT_TRUE(p->has_error());
     EXPECT_EQ(t.value, nullptr);
-    EXPECT_EQ(p->error(), "1:8: expected '=' for type alias");
+    EXPECT_EQ(p->error(),
+              R"(1:1: use of deprecated language feature: 'type' has been renamed to 'alias'
+1:8: expected '=' for type alias)");
 }
 
 }  // namespace
diff --git a/src/tint/reader/wgsl/token.cc b/src/tint/reader/wgsl/token.cc
index 8e3fbdb..290cc1e 100644
--- a/src/tint/reader/wgsl/token.cc
+++ b/src/tint/reader/wgsl/token.cc
@@ -135,6 +135,8 @@
         case Token::Type::kShiftRightEqual:
             return ">>=";
 
+        case Token::Type::kAlias:
+            return "alias";
         case Token::Type::kArray:
             return "array";
         case Token::Type::kAtomic:
diff --git a/src/tint/reader/wgsl/token.h b/src/tint/reader/wgsl/token.h
index 1c8531b..ed00ba1 100644
--- a/src/tint/reader/wgsl/token.h
+++ b/src/tint/reader/wgsl/token.h
@@ -145,6 +145,8 @@
         /// A '<<='
         kShiftLeftEqual,
 
+        /// A 'alias'
+        kAlias,
         /// A 'array'
         kArray,
         /// A 'atomic'
diff --git a/src/tint/transform/add_block_attribute_test.cc b/src/tint/transform/add_block_attribute_test.cc
index e4519dd..74dd5a9 100644
--- a/src/tint/transform/add_block_attribute_test.cc
+++ b/src/tint/transform/add_block_attribute_test.cc
@@ -143,7 +143,7 @@
 }
 )";
     auto* expect = R"(
-type Numbers = array<vec4<f32>, 4u>;
+alias Numbers = array<vec4<f32>, 4u>;
 
 @internal(block)
 struct u_block {
@@ -718,13 +718,13 @@
   f : f32,
 }
 
-type MyInner = Inner;
+alias MyInner = Inner;
 
 struct Outer {
   i : MyInner,
 }
 
-type MyOuter = Outer;
+alias MyOuter = Outer;
 
 @internal(block)
 struct u0_block {
@@ -792,7 +792,7 @@
 
 @group(0) @binding(1) var<uniform> u1 : u1_block;
 
-type MyInner = Inner;
+alias MyInner = Inner;
 
 @internal(block)
 struct u0_block {
@@ -801,7 +801,7 @@
 
 @group(0) @binding(0) var<uniform> u0 : u0_block;
 
-type MyOuter = Outer;
+alias MyOuter = Outer;
 
 struct Outer {
   i : MyInner,
diff --git a/src/tint/transform/canonicalize_entry_point_io_test.cc b/src/tint/transform/canonicalize_entry_point_io_test.cc
index 3fc0033..5af8a14 100644
--- a/src/tint/transform/canonicalize_entry_point_io_test.cc
+++ b/src/tint/transform/canonicalize_entry_point_io_test.cc
@@ -173,7 +173,7 @@
 )";
 
     auto* expect = R"(
-type myf32 = f32;
+alias myf32 = f32;
 
 struct tint_symbol_1 {
   @location(1)
@@ -222,7 +222,7 @@
   frag_main_inner(tint_symbol.loc1);
 }
 
-type myf32 = f32;
+alias myf32 = f32;
 )";
 
     DataMap data;
@@ -1589,7 +1589,7 @@
 )";
 
     auto* expect = R"(
-type myf32 = f32;
+alias myf32 = f32;
 
 struct FragmentInput {
   col1 : myf32,
@@ -1601,9 +1601,9 @@
   col2 : myf32,
 }
 
-type MyFragmentInput = FragmentInput;
+alias MyFragmentInput = FragmentInput;
 
-type MyFragmentOutput = FragmentOutput;
+alias MyFragmentOutput = FragmentOutput;
 
 fn foo(x : MyFragmentInput) -> myf32 {
   return x.col1;
@@ -1703,9 +1703,9 @@
   return wrapper_result;
 }
 
-type MyFragmentInput = FragmentInput;
+alias MyFragmentInput = FragmentInput;
 
-type MyFragmentOutput = FragmentOutput;
+alias MyFragmentOutput = FragmentOutput;
 
 fn foo(x : MyFragmentInput) -> myf32 {
   return x.col1;
@@ -1721,7 +1721,7 @@
   col2 : myf32,
 }
 
-type myf32 = f32;
+alias myf32 = f32;
 )";
 
     DataMap data;
diff --git a/src/tint/transform/combine_samplers_test.cc b/src/tint/transform/combine_samplers_test.cc
index cad3109..e400ed5 100644
--- a/src/tint/transform/combine_samplers_test.cc
+++ b/src/tint/transform/combine_samplers_test.cc
@@ -247,7 +247,7 @@
 }
 )";
     auto* expect = R"(
-type Tex2d = texture_2d<f32>;
+alias Tex2d = texture_2d<f32>;
 
 @group(0) @binding(0) @internal(disable_validation__binding_point_collision) var placeholder_sampler : sampler;
 
@@ -297,7 +297,7 @@
   return textureSample(t_s_1, placeholder_sampler, coords);
 }
 
-type Tex2d = texture_2d<f32>;
+alias Tex2d = texture_2d<f32>;
 )";
 
     DataMap data;
diff --git a/src/tint/transform/decompose_memory_access_test.cc b/src/tint/transform/decompose_memory_access_test.cc
index 4c2cd11..b58d340 100644
--- a/src/tint/transform/decompose_memory_access_test.cc
+++ b/src/tint/transform/decompose_memory_access_test.cc
@@ -3439,9 +3439,9 @@
   c : i32,
 }
 
-type A1 = S1;
+alias A1 = S1;
 
-type A1_Array = array<S1, 3>;
+alias A1_Array = array<S1, 3>;
 
 struct S2 {
   a : i32,
@@ -3449,9 +3449,9 @@
   c : i32,
 }
 
-type A2 = S2;
+alias A2 = S2;
 
-type A2_Array = array<S2>;
+alias A2_Array = array<S2>;
 
 struct SB {
   @size(128)
@@ -3537,9 +3537,9 @@
   b : A2_Array,
 }
 
-type A2_Array = array<S2>;
+alias A2_Array = array<S2>;
 
-type A2 = S2;
+alias A2 = S2;
 
 struct S2 {
   a : i32,
@@ -3547,9 +3547,9 @@
   c : i32,
 }
 
-type A1 = S1;
+alias A1 = S1;
 
-type A1_Array = array<S1, 3>;
+alias A1_Array = array<S1, 3>;
 
 struct S1 {
   a : i32,
diff --git a/src/tint/transform/decompose_strided_array_test.cc b/src/tint/transform/decompose_strided_array_test.cc
index 3befa65..abc01f2 100644
--- a/src/tint/transform/decompose_strided_array_test.cc
+++ b/src/tint/transform/decompose_strided_array_test.cc
@@ -533,7 +533,7 @@
   el : f32,
 }
 
-type ARR = array<strided_arr, 4u>;
+alias ARR = array<strided_arr, 4u>;
 
 struct S {
   a : ARR,
@@ -626,14 +626,14 @@
   el : f32,
 }
 
-type ARR_A = array<strided_arr, 2u>;
+alias ARR_A = array<strided_arr, 2u>;
 
 struct strided_arr_1 {
   @size(128)
   el : array<ARR_A, 3u>,
 }
 
-type ARR_B = array<strided_arr_1, 4u>;
+alias ARR_B = array<strided_arr_1, 4u>;
 
 struct S {
   a : ARR_B,
diff --git a/src/tint/transform/direct_variable_access_test.cc b/src/tint/transform/direct_variable_access_test.cc
index 4c112d4..71e7c94 100644
--- a/src/tint/transform/direct_variable_access_test.cc
+++ b/src/tint/transform/direct_variable_access_test.cc
@@ -242,7 +242,7 @@
 
 @group(0) @binding(0) var<uniform> U : array<array<array<vec4<i32>, 8>, 8>, 8>;
 
-type U_X_X_X = array<u32, 3u>;
+alias U_X_X_X = array<u32, 3u>;
 
 fn a_U_X_X_X(pre : i32, p : U_X_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]][p[2]];
@@ -339,7 +339,7 @@
   return i;
 }
 
-type U_X_X_X = array<u32, 3u>;
+alias U_X_X_X = array<u32, 3u>;
 
 fn a_U_X_X_X(pre : i32, p : U_X_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]][p[2]];
@@ -429,7 +429,7 @@
   return i;
 }
 
-type U_X_X = array<u32, 2u>;
+alias U_X_X = array<u32, 2u>;
 
 fn a_U_X_X(pre : i32, p : U_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]];
@@ -515,7 +515,7 @@
   return i;
 }
 
-type U_X_X = array<u32, 2u>;
+alias U_X_X = array<u32, 2u>;
 
 fn a_U_X_X(pre : i32, p : U_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]];
@@ -605,7 +605,7 @@
   return i;
 }
 
-type U_X_X = array<u32, 2u>;
+alias U_X_X = array<u32, 2u>;
 
 fn a_U_X_X(pre : i32, p : U_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]];
@@ -695,7 +695,7 @@
   return i;
 }
 
-type U_X_X = array<u32, 2u>;
+alias U_X_X = array<u32, 2u>;
 
 fn a_U_X_X(pre : i32, p : U_X_X, post : i32) -> vec4<i32> {
   return U[p[0]][p[1]];
@@ -793,7 +793,7 @@
 
 @group(0) @binding(0) var<uniform> U : array<vec4<i32>, 8>;
 
-type U_X = array<u32, 1u>;
+alias U_X = array<u32, 1u>;
 
 fn a_U_X(pre : i32, p : U_X, post : i32) -> vec4<i32> {
   return U[p[0]];
@@ -880,7 +880,7 @@
   mat : mat3x4<f32>,
 }
 
-type InnerArr = array<Inner, 4>;
+alias InnerArr = array<Inner, 4>;
 
 struct Outer {
   arr : InnerArr,
@@ -889,19 +889,19 @@
 
 @group(0) @binding(0) var<uniform> U : Outer;
 
-type U_mat_X = array<u32, 1u>;
+alias U_mat_X = array<u32, 1u>;
 
 fn f0_U_mat_X(p : U_mat_X) -> f32 {
   return U.mat[p[0]].x;
 }
 
-type U_arr_X_mat_X = array<u32, 2u>;
+alias U_arr_X_mat_X = array<u32, 2u>;
 
 fn f0_U_arr_X_mat_X(p : U_arr_X_mat_X) -> f32 {
   return U.arr[p[0]].mat[p[0]].x;
 }
 
-type U_arr_X_mat_X_1 = array<u32, 2u>;
+alias U_arr_X_mat_X_1 = array<u32, 2u>;
 
 fn f0_U_arr_X_mat_X_1(p : U_arr_X_mat_X_1) -> f32 {
   return U.arr[p[0]].mat[p[1]].x;
@@ -926,7 +926,7 @@
   return res;
 }
 
-type U_arr_X_mat = array<u32, 1u>;
+alias U_arr_X_mat = array<u32, 1u>;
 
 fn f1_U_arr_X_mat(p : U_arr_X_mat) -> f32 {
   var res : f32;
@@ -947,7 +947,7 @@
   return res;
 }
 
-type U_arr_X = array<u32, 1u>;
+alias U_arr_X = array<u32, 1u>;
 
 fn f2_U_arr_X(p : U_arr_X) -> f32 {
   let p_mat = &(U.arr[p[0]].mat);
@@ -1087,7 +1087,7 @@
 
 @group(0) @binding(0) var<storage, read_write> S : array<vec4<i32>, 8>;
 
-type S_X = array<u32, 1u>;
+alias S_X = array<u32, 1u>;
 
 fn a_S_X(pre : i32, p : S_X, post : i32) {
   S[p[0]] = vec4<i32>();
@@ -1174,7 +1174,7 @@
   mat : mat3x4<f32>,
 }
 
-type InnerArr = array<Inner, 4>;
+alias InnerArr = array<Inner, 4>;
 
 struct Outer {
   arr : InnerArr,
@@ -1183,19 +1183,19 @@
 
 @group(0) @binding(0) var<storage> S : Outer;
 
-type S_mat_X = array<u32, 1u>;
+alias S_mat_X = array<u32, 1u>;
 
 fn f0_S_mat_X(p : S_mat_X) -> f32 {
   return S.mat[p[0]].x;
 }
 
-type S_arr_X_mat_X = array<u32, 2u>;
+alias S_arr_X_mat_X = array<u32, 2u>;
 
 fn f0_S_arr_X_mat_X(p : S_arr_X_mat_X) -> f32 {
   return S.arr[p[0]].mat[p[0]].x;
 }
 
-type S_arr_X_mat_X_1 = array<u32, 2u>;
+alias S_arr_X_mat_X_1 = array<u32, 2u>;
 
 fn f0_S_arr_X_mat_X_1(p : S_arr_X_mat_X_1) -> f32 {
   return S.arr[p[0]].mat[p[1]].x;
@@ -1220,7 +1220,7 @@
   return res;
 }
 
-type S_arr_X_mat = array<u32, 1u>;
+alias S_arr_X_mat = array<u32, 1u>;
 
 fn f1_S_arr_X_mat(p : S_arr_X_mat) -> f32 {
   var res : f32;
@@ -1241,7 +1241,7 @@
   return res;
 }
 
-type S_arr_X = array<u32, 1u>;
+alias S_arr_X = array<u32, 1u>;
 
 fn f2_S_arr_X(p : S_arr_X) -> f32 {
   let p_mat = &(S.arr[p[0]].mat);
@@ -1296,7 +1296,7 @@
 
 var<workgroup> W : array<vec4<i32>, 8>;
 
-type W_X = array<u32, 1u>;
+alias W_X = array<u32, 1u>;
 
 fn a_W_X(pre : i32, p : W_X, post : i32) -> vec4<i32> {
   return W[p[0]];
@@ -1332,7 +1332,7 @@
 
 var<workgroup> W : array<vec4<i32>, 8>;
 
-type W_X = array<u32, 1u>;
+alias W_X = array<u32, 1u>;
 
 fn a_W_X(pre : i32, p : W_X, post : i32) {
   W[p[0]] = vec4<i32>();
@@ -1418,7 +1418,7 @@
   mat : mat3x4<f32>,
 }
 
-type InnerArr = array<Inner, 4>;
+alias InnerArr = array<Inner, 4>;
 
 struct Outer {
   arr : InnerArr,
@@ -1427,19 +1427,19 @@
 
 var<workgroup> W : Outer;
 
-type W_mat_X = array<u32, 1u>;
+alias W_mat_X = array<u32, 1u>;
 
 fn f0_W_mat_X(p : W_mat_X) -> f32 {
   return W.mat[p[0]].x;
 }
 
-type W_arr_X_mat_X = array<u32, 2u>;
+alias W_arr_X_mat_X = array<u32, 2u>;
 
 fn f0_W_arr_X_mat_X(p : W_arr_X_mat_X) -> f32 {
   return W.arr[p[0]].mat[p[0]].x;
 }
 
-type W_arr_X_mat_X_1 = array<u32, 2u>;
+alias W_arr_X_mat_X_1 = array<u32, 2u>;
 
 fn f0_W_arr_X_mat_X_1(p : W_arr_X_mat_X_1) -> f32 {
   return W.arr[p[0]].mat[p[1]].x;
@@ -1464,7 +1464,7 @@
   return res;
 }
 
-type W_arr_X_mat = array<u32, 1u>;
+alias W_arr_X_mat = array<u32, 1u>;
 
 fn f1_W_arr_X_mat(p : W_arr_X_mat) -> f32 {
   var res : f32;
@@ -1485,7 +1485,7 @@
   return res;
 }
 
-type W_arr_X = array<u32, 1u>;
+alias W_arr_X = array<u32, 1u>;
 
 fn f2_W_arr_X(p : W_arr_X) -> f32 {
   let p_mat = &(W.arr[p[0]].mat);
@@ -1762,7 +1762,7 @@
   return (*(p)).i;
 }
 
-type F_X = array<u32, 1u>;
+alias F_X = array<u32, 1u>;
 
 fn a_F_X(pre : i32, p_base : ptr<private, array<i32, 4u>>, p_indices : F_X, post : i32) -> i32 {
   return (*(p_base))[p_indices[0]];
@@ -1774,7 +1774,7 @@
 
 var<private> Pa : array<i32, 4>;
 
-type F_X_1 = array<u32, 1u>;
+alias F_X_1 = array<u32, 1u>;
 
 fn b() {
   a_F(10, &(Pi), 20);
@@ -1890,7 +1890,7 @@
   mat : mat3x4<f32>,
 }
 
-type InnerArr = array<Inner, 4>;
+alias InnerArr = array<Inner, 4>;
 
 struct Outer {
   arr : InnerArr,
@@ -1899,27 +1899,27 @@
 
 var<private> P : Outer;
 
-type F_mat_X = array<u32, 1u>;
+alias F_mat_X = array<u32, 1u>;
 
 fn f0_F_mat_X(p_base : ptr<private, Outer>, p_indices : F_mat_X) -> f32 {
   return (*(p_base)).mat[p_indices[0]].x;
 }
 
-type F_arr_X_mat_X = array<u32, 2u>;
+alias F_arr_X_mat_X = array<u32, 2u>;
 
 fn f0_F_arr_X_mat_X(p_base : ptr<private, Outer>, p_indices : F_arr_X_mat_X) -> f32 {
   return (*(p_base)).arr[p_indices[0]].mat[p_indices[0]].x;
 }
 
-type F_arr_X_mat_X_1 = array<u32, 2u>;
+alias F_arr_X_mat_X_1 = array<u32, 2u>;
 
 fn f0_F_arr_X_mat_X_1(p_base : ptr<private, Outer>, p_indices : F_arr_X_mat_X_1) -> f32 {
   return (*(p_base)).arr[p_indices[0]].mat[p_indices[1]].x;
 }
 
-type F_mat_X_1 = array<u32, 1u>;
+alias F_mat_X_1 = array<u32, 1u>;
 
-type F_arr_X_mat_X_2 = array<u32, 2u>;
+alias F_arr_X_mat_X_2 = array<u32, 2u>;
 
 fn f1_F_mat(p : ptr<private, Outer>) -> f32 {
   var res : f32;
@@ -1940,9 +1940,9 @@
   return res;
 }
 
-type F_arr_X_mat = array<u32, 1u>;
+alias F_arr_X_mat = array<u32, 1u>;
 
-type F_arr_X_mat_X_3 = array<u32, 2u>;
+alias F_arr_X_mat_X_3 = array<u32, 2u>;
 
 fn f1_F_arr_X_mat(p_base : ptr<private, Outer>, p_indices : F_arr_X_mat) -> f32 {
   var res : f32;
@@ -1963,16 +1963,16 @@
   return res;
 }
 
-type F_arr_X = array<u32, 1u>;
+alias F_arr_X = array<u32, 1u>;
 
-type F_arr_X_mat_1 = array<u32, 1u>;
+alias F_arr_X_mat_1 = array<u32, 1u>;
 
 fn f2_F_arr_X(p_base : ptr<private, Outer>, p_indices : F_arr_X) -> f32 {
   let p_mat = &((*(p_base)).arr[p_indices[0]].mat);
   return f1_F_arr_X_mat(p_base, F_arr_X_mat_1(p_indices[0u]));
 }
 
-type F_arr_X_1 = array<u32, 1u>;
+alias F_arr_X_1 = array<u32, 1u>;
 
 fn f3_F_arr_F_mat(p0 : ptr<private, Outer>, p1 : ptr<private, Outer>) -> f32 {
   let p0_inner = &((*(p0)).arr[3]);
@@ -2001,7 +2001,7 @@
   mat : mat3x4<f32>,
 }
 
-type InnerArr = array<Inner, 4>;
+alias InnerArr = array<Inner, 4>;
 
 struct Outer {
   arr : InnerArr,
@@ -2268,13 +2268,13 @@
   return (*(p)).i;
 }
 
-type F_X = array<u32, 1u>;
+alias F_X = array<u32, 1u>;
 
 fn a_F_X(pre : i32, p_base : ptr<function, array<i32, 4u>>, p_indices : F_X, post : i32) -> i32 {
   return (*(p_base))[p_indices[0]];
 }
 
-type F_X_1 = array<u32, 1u>;
+alias F_X_1 = array<u32, 1u>;
 
 fn b() {
   var Fi : i32;
@@ -2460,13 +2460,13 @@
   return U_str.i;
 }
 
-type U_arr_X = array<u32, 1u>;
+alias U_arr_X = array<u32, 1u>;
 
 fn fn_u_U_arr_X(p : U_arr_X) -> vec4<i32> {
   return U_arr[p[0]];
 }
 
-type U_arr_arr_X_X = array<u32, 2u>;
+alias U_arr_arr_X_X = array<u32, 2u>;
 
 fn fn_u_U_arr_arr_X_X(p : U_arr_arr_X_X) -> vec4<i32> {
   return U_arr_arr[p[0]][p[1]];
@@ -2480,13 +2480,13 @@
   return S_str.i;
 }
 
-type S_arr_X = array<u32, 1u>;
+alias S_arr_X = array<u32, 1u>;
 
 fn fn_s_S_arr_X(p : S_arr_X) -> vec4<i32> {
   return S_arr[p[0]];
 }
 
-type S_arr_arr_X_X = array<u32, 2u>;
+alias S_arr_arr_X_X = array<u32, 2u>;
 
 fn fn_s_S_arr_arr_X_X(p : S_arr_arr_X_X) -> vec4<i32> {
   return S_arr_arr[p[0]][p[1]];
@@ -2500,13 +2500,13 @@
   return W_str.i;
 }
 
-type W_arr_X = array<u32, 1u>;
+alias W_arr_X = array<u32, 1u>;
 
 fn fn_w_W_arr_X(p : W_arr_X) -> vec4<i32> {
   return W_arr[p[0]];
 }
 
-type W_arr_arr_X_X = array<u32, 2u>;
+alias W_arr_arr_X_X = array<u32, 2u>;
 
 fn fn_w_W_arr_arr_X_X(p : W_arr_arr_X_X) -> vec4<i32> {
   return W_arr_arr[p[0]][p[1]];
@@ -2578,7 +2578,7 @@
   return i;
 }
 
-type S_X = array<u32, 1u>;
+alias S_X = array<u32, 1u>;
 
 fn b_S_X(p : S_X) -> i32 {
   return S[p[0]][a(S[p[0]][0][1][2])][a(S[p[0]][a(3)][4][5])][a(S[p[0]][6][a(7)][8])];
@@ -2620,13 +2620,13 @@
 
 @group(0) @binding(0) var<storage> S : array<array<array<array<i32, 9>, 9>, 9>, 50>;
 
-type S_X_X_X_X = array<u32, 4u>;
+alias S_X_X_X_X = array<u32, 4u>;
 
 fn a_S_X_X_X_X(pre : i32, i : S_X_X_X_X, post : i32) -> i32 {
   return S[i[0]][i[0]][i[1]][i[2]];
 }
 
-type S_X = array<u32, 1u>;
+alias S_X = array<u32, 1u>;
 
 fn b_S_X(p : S_X) -> i32 {
   return a_S_X_X_X_X(10, S_X_X_X_X(p[0u], u32(a_S_X_X_X_X(20, S_X_X_X_X(p[0u], 0, 1, 2), 30)), u32(a_S_X_X_X_X(40, S_X_X_X_X(p[0u], 3, 4, 5), 50)), u32(a_S_X_X_X_X(60, S_X_X_X_X(p[0u], 6, 7, 8), 70))), 80);
@@ -2673,9 +2673,9 @@
   return i;
 }
 
-type S_X = array<u32, 1u>;
+alias S_X = array<u32, 1u>;
 
-type U_X = array<u32, 1u>;
+alias U_X = array<u32, 1u>;
 
 fn b_S_X_U_X(s : S_X, u : U_X) -> i32 {
   return S[s[0]][a(U[u[0]][0][1].x)][a(U[u[0]][a(3)][4].y)];
diff --git a/src/tint/transform/module_scope_var_to_entry_point_param_test.cc b/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
index 7ae15be..999761d 100644
--- a/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
+++ b/src/tint/transform/module_scope_var_to_entry_point_param_test.cc
@@ -621,7 +621,7 @@
   arr : array<f32>,
 }
 
-type myarray = array<f32>;
+alias myarray = array<f32>;
 
 @compute @workgroup_size(1)
 fn main(@group(0) @binding(0) @internal(disable_validation__entry_point_parameter) @internal(disable_validation__ignore_address_space) tint_symbol : ptr<storage, tint_symbol_1>) {
@@ -656,7 +656,7 @@
   _ = (*(tint_symbol)).arr[0];
 }
 
-type myarray = array<f32>;
+alias myarray = array<f32>;
 )";
 
     auto got = Run<ModuleScopeVarToEntryPointParam>(src);
diff --git a/src/tint/transform/multiplanar_external_texture_test.cc b/src/tint/transform/multiplanar_external_texture_test.cc
index c76e3e3..af1d0b4 100644
--- a/src/tint/transform/multiplanar_external_texture_test.cc
+++ b/src/tint/transform/multiplanar_external_texture_test.cc
@@ -1657,7 +1657,7 @@
 
 @group(0) @binding(3) var<uniform> ext_tex_params : ExternalTextureParams;
 
-type ET = texture_external;
+alias ET = texture_external;
 
 fn gammaCorrection(v : vec3<f32>, params : GammaTransferParams) -> vec3<f32> {
   let cond = (abs(v) < vec3<f32>(params.D));
@@ -1795,7 +1795,7 @@
 
 @group(0) @binding(1) var smp : sampler;
 
-type ET = texture_external;
+alias ET = texture_external;
 )";
     DataMap data;
     data.Add<MultiplanarExternalTexture::NewBindingPoints>(MultiplanarExternalTexture::BindingsMap{
diff --git a/src/tint/transform/preserve_padding_test.cc b/src/tint/transform/preserve_padding_test.cc
index f47cb3e..854b4a5 100644
--- a/src/tint/transform/preserve_padding_test.cc
+++ b/src/tint/transform/preserve_padding_test.cc
@@ -386,7 +386,7 @@
     auto* expect = R"(
 enable chromium_experimental_full_ptr_parameters;
 
-type Array = array<array<vec3<u32>, 4>, 3>;
+alias Array = array<array<vec3<u32>, 4>, 3>;
 
 @group(0) @binding(0) var<storage, read_write> v : Array;
 
diff --git a/src/tint/transform/promote_initializers_to_let_test.cc b/src/tint/transform/promote_initializers_to_let_test.cc
index dd72671..32e2ec9 100644
--- a/src/tint/transform/promote_initializers_to_let_test.cc
+++ b/src/tint/transform/promote_initializers_to_let_test.cc
@@ -1194,7 +1194,7 @@
 
 TEST_F(PromoteInitializersToLetTest, NoChangeOnVarDecl) {
     auto* src = R"(
-type F = f32;
+alias F = f32;
 
 fn f() {
   var local_arr = array<f32, 4u>(0.0, 1.0, 2.0, 3.0);
@@ -1222,7 +1222,7 @@
 
 const module_str : F = F(2.0);
 
-type F = f32;
+alias F = f32;
 
 const module_arr : array<f32, 4u> = array<f32, 4u>(0.0, 1.0, 2.0, 3.0);
 )";
diff --git a/src/tint/transform/renamer_test.cc b/src/tint/transform/renamer_test.cc
index 0628063..152489a 100644
--- a/src/tint/transform/renamer_test.cc
+++ b/src/tint/transform/renamer_test.cc
@@ -1673,7 +1673,7 @@
 )");
 
     auto expect = expand(R"(
-type tint_symbol = i32;
+alias tint_symbol = i32;
 
 @fragment
 fn tint_symbol_1() {
diff --git a/src/tint/transform/single_entry_point_test.cc b/src/tint/transform/single_entry_point_test.cc
index b225008..b8f79f6 100644
--- a/src/tint/transform/single_entry_point_test.cc
+++ b/src/tint/transform/single_entry_point_test.cc
@@ -389,7 +389,7 @@
 
 @id(5) override c5 : u32 = (2 * c4);
 
-type arr_ty = array<i32, (2 * c5)>;
+alias arr_ty = array<i32, (2 * c5)>;
 
 var<workgroup> arr : arr_ty;
 
@@ -593,7 +593,7 @@
     auto* src = R"(
 const MY_SIZE = 5u;
 
-type Arr = array<i32, MY_SIZE>;
+alias Arr = array<i32, MY_SIZE>;
 
 @fragment
 fn main() {
diff --git a/src/tint/transform/spirv_atomic_test.cc b/src/tint/transform/spirv_atomic_test.cc
index 36312f7..bef061c 100644
--- a/src/tint/transform/spirv_atomic_test.cc
+++ b/src/tint/transform/spirv_atomic_test.cc
@@ -226,13 +226,13 @@
 )";
 
     auto* expect = R"(
-type A0 = u32;
+alias A0 = u32;
 
-type A1 = array<A0, 1>;
+alias A1 = array<A0, 1>;
 
-type A2 = array<A1, 2>;
+alias A2 = array<A1, 2>;
 
-type A3 = array<A2, 3>;
+alias A3 = array<A2, 3>;
 
 var<workgroup> wg : array<array<array<atomic<u32>, 1u>, 2u>, 3u>;
 
diff --git a/src/tint/transform/unshadow_test.cc b/src/tint/transform/unshadow_test.cc
index d2ee8a5..ec17ff5 100644
--- a/src/tint/transform/unshadow_test.cc
+++ b/src/tint/transform/unshadow_test.cc
@@ -66,7 +66,7 @@
 )";
 
     auto* expect = R"(
-type a = i32;
+alias a = i32;
 
 fn X() {
   var a_1 = false;
@@ -116,7 +116,7 @@
   const a_3 = true;
 }
 
-type a = i32;
+alias a = i32;
 )";
 
     auto got = Run<Unshadow>(src);
@@ -704,7 +704,7 @@
 )";
 
     auto* expect = R"(
-type a = i32;
+alias a = i32;
 
 fn F(a_1 : a) {
   {
@@ -745,7 +745,7 @@
   }
 }
 
-type a = i32;
+alias a = i32;
 )";
 
     auto got = Run<Unshadow>(src);
diff --git a/src/tint/writer/wgsl/generator_impl.cc b/src/tint/writer/wgsl/generator_impl.cc
index 0c20af7..2a72272 100644
--- a/src/tint/writer/wgsl/generator_impl.cc
+++ b/src/tint/writer/wgsl/generator_impl.cc
@@ -108,7 +108,7 @@
         ty,
         [&](const ast::Alias* alias) {  //
             auto out = line();
-            out << "type " << program_->Symbols().NameFor(alias->name) << " = ";
+            out << "alias " << program_->Symbols().NameFor(alias->name) << " = ";
             if (!EmitType(out, alias->type)) {
                 return false;
             }
diff --git a/src/tint/writer/wgsl/generator_impl_alias_type_test.cc b/src/tint/writer/wgsl/generator_impl_alias_type_test.cc
index dd0584d..10a56b1 100644
--- a/src/tint/writer/wgsl/generator_impl_alias_type_test.cc
+++ b/src/tint/writer/wgsl/generator_impl_alias_type_test.cc
@@ -25,7 +25,7 @@
     GeneratorImpl& gen = Build();
 
     ASSERT_TRUE(gen.EmitTypeDecl(alias)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(type a = f32;
+    EXPECT_EQ(gen.result(), R"(alias a = f32;
 )");
 }
 
@@ -45,7 +45,7 @@
   a : f32,
   b : i32,
 }
-type B = A;
+alias B = A;
 )");
 }
 
@@ -60,7 +60,7 @@
     GeneratorImpl& gen = Build();
 
     ASSERT_TRUE(gen.EmitTypeDecl(alias)) << gen.error();
-    EXPECT_EQ(gen.result(), R"(type B = A;
+    EXPECT_EQ(gen.result(), R"(alias B = A;
 )");
 }
 
diff --git a/test/tint/array/assign_to_function_var.wgsl b/test/tint/array/assign_to_function_var.wgsl
index 968ca92..ac8aa71 100644
--- a/test/tint/array/assign_to_function_var.wgsl
+++ b/test/tint/array/assign_to_function_var.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_function_var.wgsl.expected.wgsl b/test/tint/array/assign_to_function_var.wgsl.expected.wgsl
index b952b66..ae87ab4 100644
--- a/test/tint/array/assign_to_function_var.wgsl.expected.wgsl
+++ b/test/tint/array/assign_to_function_var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_private_var.wgsl b/test/tint/array/assign_to_private_var.wgsl
index 6a32874..07f05a2 100644
--- a/test/tint/array/assign_to_private_var.wgsl
+++ b/test/tint/array/assign_to_private_var.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_private_var.wgsl.expected.wgsl b/test/tint/array/assign_to_private_var.wgsl.expected.wgsl
index 96ea662..63721f9 100644
--- a/test/tint/array/assign_to_private_var.wgsl.expected.wgsl
+++ b/test/tint/array/assign_to_private_var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_storage_var.wgsl b/test/tint/array/assign_to_storage_var.wgsl
index 879219d..1b135c8 100644
--- a/test/tint/array/assign_to_storage_var.wgsl
+++ b/test/tint/array/assign_to_storage_var.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_storage_var.wgsl.expected.wgsl b/test/tint/array/assign_to_storage_var.wgsl.expected.wgsl
index f8b519d..8647639 100644
--- a/test/tint/array/assign_to_storage_var.wgsl.expected.wgsl
+++ b/test/tint/array/assign_to_storage_var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_subexpr.wgsl b/test/tint/array/assign_to_subexpr.wgsl
index 04fa97e..ce4b50a 100644
--- a/test/tint/array/assign_to_subexpr.wgsl
+++ b/test/tint/array/assign_to_subexpr.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<i32, 4>;
+alias ArrayType = array<i32, 4>;
 
 struct S {
   arr : array<i32, 4>,
diff --git a/test/tint/array/assign_to_subexpr.wgsl.expected.wgsl b/test/tint/array/assign_to_subexpr.wgsl.expected.wgsl
index 614941a..91dc949 100644
--- a/test/tint/array/assign_to_subexpr.wgsl.expected.wgsl
+++ b/test/tint/array/assign_to_subexpr.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<i32, 4>;
+alias ArrayType = array<i32, 4>;
 
 struct S {
   arr : array<i32, 4>,
diff --git a/test/tint/array/assign_to_workgroup_var.wgsl b/test/tint/array/assign_to_workgroup_var.wgsl
index aae2e7d..eb3a80b 100644
--- a/test/tint/array/assign_to_workgroup_var.wgsl
+++ b/test/tint/array/assign_to_workgroup_var.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/assign_to_workgroup_var.wgsl.expected.wgsl b/test/tint/array/assign_to_workgroup_var.wgsl.expected.wgsl
index 66c3814..301b212 100644
--- a/test/tint/array/assign_to_workgroup_var.wgsl.expected.wgsl
+++ b/test/tint/array/assign_to_workgroup_var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type ArrayType = array<vec4<i32>, 4>;
+alias ArrayType = array<vec4<i32>, 4>;
 
 struct S {
   arr : ArrayType,
diff --git a/test/tint/array/strides.spvasm.expected.wgsl b/test/tint/array/strides.spvasm.expected.wgsl
index aa59b2f..bd82154 100644
--- a/test/tint/array/strides.spvasm.expected.wgsl
+++ b/test/tint/array/strides.spvasm.expected.wgsl
@@ -3,16 +3,16 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
-type Arr_1 = array<Arr, 3u>;
+alias Arr_1 = array<Arr, 3u>;
 
 struct strided_arr_1 {
   @size(128)
   el : Arr_1,
 }
 
-type Arr_2 = array<strided_arr_1, 4u>;
+alias Arr_2 = array<strided_arr_1, 4u>;
 
 struct S {
   /* @offset(0) */
diff --git a/test/tint/bug/tint/1088.spvasm.expected.wgsl b/test/tint/bug/tint/1088.spvasm.expected.wgsl
index 5468399..8d40799 100644
--- a/test/tint/bug/tint/1088.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/1088.spvasm.expected.wgsl
@@ -1,11 +1,11 @@
-type Arr = array<mat4x4<f32>, 2u>;
+alias Arr = array<mat4x4<f32>, 2u>;
 
 struct strided_arr {
   @size(16)
   el : f32,
 }
 
-type Arr_1 = array<strided_arr, 4u>;
+alias Arr_1 = array<strided_arr, 4u>;
 
 struct LeftOver {
   /* @offset(0) */
diff --git a/test/tint/bug/tint/1598.wgsl b/test/tint/bug/tint/1598.wgsl
index 8c17211..72acc61 100644
--- a/test/tint/bug/tint/1598.wgsl
+++ b/test/tint/bug/tint/1598.wgsl
@@ -1,6 +1,6 @@
 const MY_SIZE = 5u;
 
-type Arr = array<i32, MY_SIZE>;
+alias Arr = array<i32, MY_SIZE>;
 
 @fragment
 fn main() {
diff --git a/test/tint/bug/tint/1598.wgsl.expected.wgsl b/test/tint/bug/tint/1598.wgsl.expected.wgsl
index f9fa321..1a4abbc 100644
--- a/test/tint/bug/tint/1598.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1598.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 const MY_SIZE = 5u;
 
-type Arr = array<i32, MY_SIZE>;
+alias Arr = array<i32, MY_SIZE>;
 
 @fragment
 fn main() {
diff --git a/test/tint/bug/tint/1764.wgsl b/test/tint/bug/tint/1764.wgsl
index 0b9541b..1448fbd 100644
--- a/test/tint/bug/tint/1764.wgsl
+++ b/test/tint/bug/tint/1764.wgsl
@@ -1,7 +1,7 @@
 // flags: --transform substitute_override
 
 override O = 123;
-type A = array<i32, O*2>;
+alias A = array<i32, O*2>;
 
 var<workgroup> W : A;
 
diff --git a/test/tint/bug/tint/1764.wgsl.expected.wgsl b/test/tint/bug/tint/1764.wgsl.expected.wgsl
index dd336f9..e8d12e9 100644
--- a/test/tint/bug/tint/1764.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/1764.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 const O = 123;
 
-type A = array<i32, (O * 2)>;
+alias A = array<i32, (O * 2)>;
 
 var<workgroup> W : A;
 
diff --git a/test/tint/bug/tint/1776.spvasm.expected.wgsl b/test/tint/bug/tint/1776.spvasm.expected.wgsl
index c5f6bc7..f8e0dc8 100644
--- a/test/tint/bug/tint/1776.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/1776.spvasm.expected.wgsl
@@ -5,7 +5,7 @@
   b : i32,
 }
 
-type RTArr = array<S>;
+alias RTArr = array<S>;
 
 struct sb_block {
   /* @offset(0) */
diff --git a/test/tint/bug/tint/221.wgsl b/test/tint/bug/tint/221.wgsl
index 49c40d1..ef7d801 100644
--- a/test/tint/bug/tint/221.wgsl
+++ b/test/tint/bug/tint/221.wgsl
@@ -1,4 +1,4 @@
-type Arr = array<u32, 50>;
+alias Arr = array<u32, 50>;
 
 struct Buf{
   count : u32,
diff --git a/test/tint/bug/tint/221.wgsl.expected.wgsl b/test/tint/bug/tint/221.wgsl.expected.wgsl
index 0a49ba5..dd561e4 100644
--- a/test/tint/bug/tint/221.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/221.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type Arr = array<u32, 50>;
+alias Arr = array<u32, 50>;
 
 struct Buf {
   count : u32,
diff --git a/test/tint/bug/tint/782.wgsl b/test/tint/bug/tint/782.wgsl
index 46868f6..a284295 100644
--- a/test/tint/bug/tint/782.wgsl
+++ b/test/tint/bug/tint/782.wgsl
@@ -1,5 +1,5 @@
-type ArrayExplicitStride = array<i32, 2>;
-type ArrayImplicitStride =               array<i32, 2>;
+alias ArrayExplicitStride = array<i32, 2>;
+alias ArrayImplicitStride = array<i32, 2>;
 
 fn foo() {
   var explicitStride : ArrayExplicitStride;
diff --git a/test/tint/bug/tint/782.wgsl.expected.wgsl b/test/tint/bug/tint/782.wgsl.expected.wgsl
index 897e0fc..92b739b 100644
--- a/test/tint/bug/tint/782.wgsl.expected.wgsl
+++ b/test/tint/bug/tint/782.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-type ArrayExplicitStride = array<i32, 2>;
+alias ArrayExplicitStride = array<i32, 2>;
 
-type ArrayImplicitStride = array<i32, 2>;
+alias ArrayImplicitStride = array<i32, 2>;
 
 fn foo() {
   var explicitStride : ArrayExplicitStride;
diff --git a/test/tint/bug/tint/870.spvasm.expected.wgsl b/test/tint/bug/tint/870.spvasm.expected.wgsl
index 5e434de..12b2c74 100644
--- a/test/tint/bug/tint/870.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/870.spvasm.expected.wgsl
@@ -1,4 +1,4 @@
-type Arr = array<i32, 6u>;
+alias Arr = array<i32, 6u>;
 
 struct sspp962805860buildInformationS {
   /* @offset(0) */
diff --git a/test/tint/bug/tint/977.spvasm.expected.wgsl b/test/tint/bug/tint/977.spvasm.expected.wgsl
index 984d555..2071796 100644
--- a/test/tint/bug/tint/977.spvasm.expected.wgsl
+++ b/test/tint/bug/tint/977.spvasm.expected.wgsl
@@ -1,13 +1,13 @@
-type RTArr = array<f32>;
+alias RTArr = array<f32>;
 
-type RTArr_1 = array<f32>;
+alias RTArr_1 = array<f32>;
 
 struct ResultMatrix {
   /* @offset(0) */
   numbers : RTArr_1,
 }
 
-type RTArr_2 = array<f32>;
+alias RTArr_2 = array<f32>;
 
 struct FirstMatrix {
   /* @offset(0) */
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.wgsl b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.wgsl
index 2b2b741..4c957ce 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.wgsl
@@ -1,8 +1,8 @@
-type Arr = array<u32, 1u>;
+alias Arr = array<u32, 1u>;
 
-type Arr_1 = array<Arr, 2u>;
+alias Arr_1 = array<Arr, 2u>;
 
-type Arr_2 = array<Arr_1, 3u>;
+alias Arr_2 = array<Arr_1, 3u>;
 
 var<private> local_invocation_index_1 : u32;
 
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl
index 0f6f01e..5ae0fcb 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl
@@ -1,7 +1,7 @@
-type A0 = atomic<u32>;
-type A1 = array<A0, 1>;
-type A2 = array<A1, 2>;
-type A3 = array<A2, 3>;
+alias A0 = atomic<u32>;
+alias A1 = array<A0, 1>;
+alias A2 = array<A1, 2>;
+alias A3 = array<A2, 3>;
 
 var<workgroup> wg : A3;
 
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.wgsl b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.wgsl
index 0a5ac8a..960b5fc 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.wgsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.wgsl
@@ -1,10 +1,10 @@
-type A0 = atomic<u32>;
+alias A0 = atomic<u32>;
 
-type A1 = array<A0, 1>;
+alias A1 = array<A0, 1>;
 
-type A2 = array<A1, 2>;
+alias A2 = array<A1, 2>;
 
-type A3 = array<A2, 3>;
+alias A3 = array<A2, 3>;
 
 var<workgroup> wg : A3;
 
diff --git a/test/tint/builtins/atomicStore/array/array.spvasm.expected.wgsl b/test/tint/builtins/atomicStore/array/array.spvasm.expected.wgsl
index c597173..f1ce6c7 100644
--- a/test/tint/builtins/atomicStore/array/array.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/array/array.spvasm.expected.wgsl
@@ -1,4 +1,4 @@
-type Arr = array<u32, 4u>;
+alias Arr = array<u32, 4u>;
 
 var<private> local_invocation_index_1 : u32;
 
diff --git a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.wgsl b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.wgsl
index 2b2b741..4c957ce 100644
--- a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.wgsl
@@ -1,8 +1,8 @@
-type Arr = array<u32, 1u>;
+alias Arr = array<u32, 1u>;
 
-type Arr_1 = array<Arr, 2u>;
+alias Arr_1 = array<Arr, 2u>;
 
-type Arr_2 = array<Arr_1, 3u>;
+alias Arr_2 = array<Arr_1, 3u>;
 
 var<private> local_invocation_index_1 : u32;
 
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl
index ef6735c..b3a1105 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.wgsl
@@ -16,7 +16,7 @@
   y : u32,
 }
 
-type Arr = array<S, 10u>;
+alias Arr = array<S, 10u>;
 
 var<private> local_invocation_index_1 : u32;
 
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl
index 09769cf..b8953f1 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.wgsl
@@ -1,4 +1,4 @@
-type Arr = array<u32, 10u>;
+alias Arr = array<u32, 10u>;
 
 struct S_atomic {
   /* @offset(0) */
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl
index f9d42d8..9e9e17f 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl
@@ -1,6 +1,6 @@
 // flags: --overrides wgsize=64
 override wgsize : i32;
-type Array = array<i32, wgsize * 2>;
+alias Array = array<i32, wgsize * 2>;
 var<workgroup> v : Array;
 
 fn foo() -> i32 {
diff --git a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
index df6498e..e4ff0d4 100644
--- a/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
+++ b/test/tint/builtins/workgroupUniformLoad/array_overridable_count_aliased.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 const wgsize : i32 = 64i;
 
-type Array = array<i32, (wgsize * 2)>;
+alias Array = array<i32, (wgsize * 2)>;
 
 var<workgroup> v : Array;
 
diff --git a/test/tint/const/global/global.wgsl b/test/tint/const/global/global.wgsl
index 12f56a8..0351b32 100644
--- a/test/tint/const/global/global.wgsl
+++ b/test/tint/const/global/global.wgsl
@@ -1,4 +1,4 @@
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 // Global consts
 const c1 = 1;
diff --git a/test/tint/const/global/global.wgsl.expected.wgsl b/test/tint/const/global/global.wgsl.expected.wgsl
index 8fc0106..42a04be 100644
--- a/test/tint/const/global/global.wgsl.expected.wgsl
+++ b/test/tint/const/global/global.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 const c1 = 1;
 
diff --git a/test/tint/const/inferred/function.wgsl b/test/tint/const/inferred/function.wgsl
index cd8811b..f7794d1 100644
--- a/test/tint/const/inferred/function.wgsl
+++ b/test/tint/const/inferred/function.wgsl
@@ -1,4 +1,4 @@
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 // Function-scope consts
 fn const_decls() {
diff --git a/test/tint/const/inferred/function.wgsl.expected.wgsl b/test/tint/const/inferred/function.wgsl.expected.wgsl
index 94ff328..0d64f50 100644
--- a/test/tint/const/inferred/function.wgsl.expected.wgsl
+++ b/test/tint/const/inferred/function.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 fn const_decls() {
   const v1 = 1;
diff --git a/test/tint/identifiers/underscore/double/alias.wgsl b/test/tint/identifiers/underscore/double/alias.wgsl
index 51d4dad..df88a40 100644
--- a/test/tint/identifiers/underscore/double/alias.wgsl
+++ b/test/tint/identifiers/underscore/double/alias.wgsl
@@ -1,7 +1,7 @@
-type a = i32;
-type a__ = i32;
-type b = a;
-type b__ = a__;
+alias a = i32;
+alias a__ = i32;
+alias b = a;
+alias b__ = a__;
 
 fn f() {
     var c : b;
diff --git a/test/tint/identifiers/underscore/double/alias.wgsl.expected.wgsl b/test/tint/identifiers/underscore/double/alias.wgsl.expected.wgsl
index d60b6b4..104adb6 100644
--- a/test/tint/identifiers/underscore/double/alias.wgsl.expected.wgsl
+++ b/test/tint/identifiers/underscore/double/alias.wgsl.expected.wgsl
@@ -1,10 +1,10 @@
-type a = i32;
+alias a = i32;
 
-type a__ = i32;
+alias a__ = i32;
 
-type b = a;
+alias b = a;
 
-type b__ = a__;
+alias b__ = a__;
 
 fn f() {
   var c : b;
diff --git a/test/tint/identifiers/underscore/prefix/lower/alias.wgsl b/test/tint/identifiers/underscore/prefix/lower/alias.wgsl
index bb06471..9dda0ec 100644
--- a/test/tint/identifiers/underscore/prefix/lower/alias.wgsl
+++ b/test/tint/identifiers/underscore/prefix/lower/alias.wgsl
@@ -1,7 +1,7 @@
-type a = i32;
-type _a = i32;
-type b = a;
-type _b = _a;
+alias a = i32;
+alias _a = i32;
+alias b = a;
+alias _b = _a;
 
 fn f() {
     var c : b;
diff --git a/test/tint/identifiers/underscore/prefix/lower/alias.wgsl.expected.wgsl b/test/tint/identifiers/underscore/prefix/lower/alias.wgsl.expected.wgsl
index da69752..e5d6675 100644
--- a/test/tint/identifiers/underscore/prefix/lower/alias.wgsl.expected.wgsl
+++ b/test/tint/identifiers/underscore/prefix/lower/alias.wgsl.expected.wgsl
@@ -1,10 +1,10 @@
-type a = i32;
+alias a = i32;
 
-type _a = i32;
+alias _a = i32;
 
-type b = a;
+alias b = a;
 
-type _b = _a;
+alias _b = _a;
 
 fn f() {
   var c : b;
diff --git a/test/tint/identifiers/underscore/prefix/upper/alias.wgsl b/test/tint/identifiers/underscore/prefix/upper/alias.wgsl
index d6fcd94..c42bab0 100644
--- a/test/tint/identifiers/underscore/prefix/upper/alias.wgsl
+++ b/test/tint/identifiers/underscore/prefix/upper/alias.wgsl
@@ -1,7 +1,7 @@
-type A = i32;
-type _A = i32;
-type B = A;
-type _B = _A;
+alias A = i32;
+alias _A = i32;
+alias B = A;
+alias _B = _A;
 
 fn f() {
     var c : B;
diff --git a/test/tint/identifiers/underscore/prefix/upper/alias.wgsl.expected.wgsl b/test/tint/identifiers/underscore/prefix/upper/alias.wgsl.expected.wgsl
index e84f521..6160d89 100644
--- a/test/tint/identifiers/underscore/prefix/upper/alias.wgsl.expected.wgsl
+++ b/test/tint/identifiers/underscore/prefix/upper/alias.wgsl.expected.wgsl
@@ -1,10 +1,10 @@
-type A = i32;
+alias A = i32;
 
-type _A = i32;
+alias _A = i32;
 
-type B = A;
+alias B = A;
 
-type _B = _A;
+alias _B = _A;
 
 fn f() {
   var c : B;
diff --git a/test/tint/let/inferred/function.wgsl b/test/tint/let/inferred/function.wgsl
index b436f46..9edb603 100644
--- a/test/tint/let/inferred/function.wgsl
+++ b/test/tint/let/inferred/function.wgsl
@@ -2,7 +2,7 @@
     f1 : f32,
 };
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 fn ret_i32() -> i32 { return 1; }
 fn ret_u32() -> u32 { return 1u; }
diff --git a/test/tint/let/inferred/function.wgsl.expected.wgsl b/test/tint/let/inferred/function.wgsl.expected.wgsl
index 82654aa..d080701 100644
--- a/test/tint/let/inferred/function.wgsl.expected.wgsl
+++ b/test/tint/let/inferred/function.wgsl.expected.wgsl
@@ -2,7 +2,7 @@
   f1 : f32,
 }
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 fn ret_i32() -> i32 {
   return 1;
diff --git a/test/tint/out_of_order_decls/alias/alias.wgsl b/test/tint/out_of_order_decls/alias/alias.wgsl
index ab66446..31105b4 100644
--- a/test/tint/out_of_order_decls/alias/alias.wgsl
+++ b/test/tint/out_of_order_decls/alias/alias.wgsl
@@ -1,5 +1,5 @@
-type T1 = T2;
-type T2 = i32;
+alias T1 = T2;
+alias T2 = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/out_of_order_decls/alias/alias.wgsl.expected.wgsl b/test/tint/out_of_order_decls/alias/alias.wgsl.expected.wgsl
index fbb0dd4..abff62d 100644
--- a/test/tint/out_of_order_decls/alias/alias.wgsl.expected.wgsl
+++ b/test/tint/out_of_order_decls/alias/alias.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-type T1 = T2;
+alias T1 = T2;
 
-type T2 = i32;
+alias T2 = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/out_of_order_decls/alias/struct.wgsl b/test/tint/out_of_order_decls/alias/struct.wgsl
index f736800..05391c9 100644
--- a/test/tint/out_of_order_decls/alias/struct.wgsl
+++ b/test/tint/out_of_order_decls/alias/struct.wgsl
@@ -1,4 +1,4 @@
-type T = S;
+alias T = S;
 
 struct S {
   m : i32,
diff --git a/test/tint/out_of_order_decls/alias/struct.wgsl.expected.wgsl b/test/tint/out_of_order_decls/alias/struct.wgsl.expected.wgsl
index f736800..05391c9 100644
--- a/test/tint/out_of_order_decls/alias/struct.wgsl.expected.wgsl
+++ b/test/tint/out_of_order_decls/alias/struct.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type T = S;
+alias T = S;
 
 struct S {
   m : i32,
diff --git a/test/tint/out_of_order_decls/array/alias.wgsl b/test/tint/out_of_order_decls/array/alias.wgsl
index d7c7835..499c802 100644
--- a/test/tint/out_of_order_decls/array/alias.wgsl
+++ b/test/tint/out_of_order_decls/array/alias.wgsl
@@ -1,5 +1,5 @@
 var<private> A : array<T, 4>;
-type T = i32;
+alias T = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/out_of_order_decls/array/alias.wgsl.expected.wgsl b/test/tint/out_of_order_decls/array/alias.wgsl.expected.wgsl
index 5d17f7b..98bd98b 100644
--- a/test/tint/out_of_order_decls/array/alias.wgsl.expected.wgsl
+++ b/test/tint/out_of_order_decls/array/alias.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
 var<private> A : array<T, 4>;
 
-type T = i32;
+alias T = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/out_of_order_decls/func/type.wgsl b/test/tint/out_of_order_decls/func/type.wgsl
index 596ac2c..5872419 100644
--- a/test/tint/out_of_order_decls/func/type.wgsl
+++ b/test/tint/out_of_order_decls/func/type.wgsl
@@ -3,4 +3,4 @@
   var b : T;
 }
 
-type T = i32;
+alias T = i32;
diff --git a/test/tint/out_of_order_decls/func/type.wgsl.expected.wgsl b/test/tint/out_of_order_decls/func/type.wgsl.expected.wgsl
index 596ac2c..5872419 100644
--- a/test/tint/out_of_order_decls/func/type.wgsl.expected.wgsl
+++ b/test/tint/out_of_order_decls/func/type.wgsl.expected.wgsl
@@ -3,4 +3,4 @@
   var b : T;
 }
 
-type T = i32;
+alias T = i32;
diff --git a/test/tint/out_of_order_decls/struct/alias.wgsl b/test/tint/out_of_order_decls/struct/alias.wgsl
index 84f8679..8df3e8e 100644
--- a/test/tint/out_of_order_decls/struct/alias.wgsl
+++ b/test/tint/out_of_order_decls/struct/alias.wgsl
@@ -2,7 +2,7 @@
   m : T,
 }
 
-type T = i32;
+alias T = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/out_of_order_decls/struct/alias.wgsl.expected.wgsl b/test/tint/out_of_order_decls/struct/alias.wgsl.expected.wgsl
index 84f8679..8df3e8e 100644
--- a/test/tint/out_of_order_decls/struct/alias.wgsl.expected.wgsl
+++ b/test/tint/out_of_order_decls/struct/alias.wgsl.expected.wgsl
@@ -2,7 +2,7 @@
   m : T,
 }
 
-type T = i32;
+alias T = i32;
 
 @fragment
 fn f() {
diff --git a/test/tint/shadowing/alias/const.wgsl b/test/tint/shadowing/alias/const.wgsl
index a2bdd05..9a279a4 100644
--- a/test/tint/shadowing/alias/const.wgsl
+++ b/test/tint/shadowing/alias/const.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/alias/const.wgsl.expected.wgsl b/test/tint/shadowing/alias/const.wgsl.expected.wgsl
index a2bdd05..9a279a4 100644
--- a/test/tint/shadowing/alias/const.wgsl.expected.wgsl
+++ b/test/tint/shadowing/alias/const.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/alias/let.wgsl b/test/tint/shadowing/alias/let.wgsl
index 558efe6..dc30530 100644
--- a/test/tint/shadowing/alias/let.wgsl
+++ b/test/tint/shadowing/alias/let.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/alias/let.wgsl.expected.wgsl b/test/tint/shadowing/alias/let.wgsl.expected.wgsl
index 558efe6..dc30530 100644
--- a/test/tint/shadowing/alias/let.wgsl.expected.wgsl
+++ b/test/tint/shadowing/alias/let.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/alias/param.wgsl b/test/tint/shadowing/alias/param.wgsl
index 42d95bf..3e1ba53 100644
--- a/test/tint/shadowing/alias/param.wgsl
+++ b/test/tint/shadowing/alias/param.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f(a : a) {
   let b = a;
diff --git a/test/tint/shadowing/alias/param.wgsl.expected.wgsl b/test/tint/shadowing/alias/param.wgsl.expected.wgsl
index 42d95bf..3e1ba53 100644
--- a/test/tint/shadowing/alias/param.wgsl.expected.wgsl
+++ b/test/tint/shadowing/alias/param.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f(a : a) {
   let b = a;
diff --git a/test/tint/shadowing/alias/var.wgsl b/test/tint/shadowing/alias/var.wgsl
index 10e0c25..087abc7 100644
--- a/test/tint/shadowing/alias/var.wgsl
+++ b/test/tint/shadowing/alias/var.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/alias/var.wgsl.expected.wgsl b/test/tint/shadowing/alias/var.wgsl.expected.wgsl
index 10e0c25..087abc7 100644
--- a/test/tint/shadowing/alias/var.wgsl.expected.wgsl
+++ b/test/tint/shadowing/alias/var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = i32;
+alias a = i32;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/const.wgsl b/test/tint/shadowing/short_names/const.wgsl
index e1fb581..916c2b3 100644
--- a/test/tint/shadowing/short_names/const.wgsl
+++ b/test/tint/shadowing/short_names/const.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/const.wgsl.expected.wgsl b/test/tint/shadowing/short_names/const.wgsl.expected.wgsl
index e1fb581..916c2b3 100644
--- a/test/tint/shadowing/short_names/const.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/const.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/let.wgsl b/test/tint/shadowing/short_names/let.wgsl
index 9dc6ab9..84b2245 100644
--- a/test/tint/shadowing/short_names/let.wgsl
+++ b/test/tint/shadowing/short_names/let.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/let.wgsl.expected.wgsl b/test/tint/shadowing/short_names/let.wgsl.expected.wgsl
index 9dc6ab9..84b2245 100644
--- a/test/tint/shadowing/short_names/let.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/let.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/renamer/type.wgsl b/test/tint/shadowing/short_names/renamer/type.wgsl
index af2d901..cdb2da2 100644
--- a/test/tint/shadowing/short_names/renamer/type.wgsl
+++ b/test/tint/shadowing/short_names/renamer/type.wgsl
@@ -2,8 +2,8 @@
 
 // Evilness 😈. Don't go getting any ideas!
 struct vec4f { i : i32, }
-type vec2f = f32;
-type vec2i = bool;
+alias vec2f = f32;
+alias vec2i = bool;
 
 @vertex fn main(@builtin(vertex_index) VertexIndex : u32) -> @builtin(position) vec4<f32> {
     let s = vec4f(1);
diff --git a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
index 05eac3f..b07672f 100644
--- a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.wgsl
@@ -2,9 +2,9 @@
   tint_symbol_1 : i32,
 }
 
-type tint_symbol_2 = f32;
+alias tint_symbol_2 = f32;
 
-type tint_symbol_3 = bool;
+alias tint_symbol_3 = bool;
 
 @vertex
 fn tint_symbol_4(@builtin(vertex_index) tint_symbol_5 : u32) -> @builtin(position) vec4<f32> {
diff --git a/test/tint/shadowing/short_names/var.wgsl b/test/tint/shadowing/short_names/var.wgsl
index e33e30b..b625902 100644
--- a/test/tint/shadowing/short_names/var.wgsl
+++ b/test/tint/shadowing/short_names/var.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/shadowing/short_names/var.wgsl.expected.wgsl b/test/tint/shadowing/short_names/var.wgsl.expected.wgsl
index e33e30b..b625902 100644
--- a/test/tint/shadowing/short_names/var.wgsl.expected.wgsl
+++ b/test/tint/shadowing/short_names/var.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-type a = vec3f;
+alias a = vec3f;
 
 fn f() {
   {
diff --git a/test/tint/unicode/identifiers.wgsl b/test/tint/unicode/identifiers.wgsl
index 64fc205..bc3935d 100644
--- a/test/tint/unicode/identifiers.wgsl
+++ b/test/tint/unicode/identifiers.wgsl
@@ -1,5 +1,5 @@
-type 𝓉𝓎𝓅ℯ_𝒶 = i32;
-type 𝐭𝐲𝐩𝐞_𝐛 = f32;
+alias 𝓉𝓎𝓅ℯ_𝒶 = i32;
+alias 𝐭𝐲𝐩𝐞_𝐛 = f32;
 
 fn 𝓯𝓾𝓷𝓬𝓽𝓲𝓸𝓷(ᵖᵃʳᵃᵐ : 𝓉𝓎𝓅ℯ_𝒶) -> 𝐭𝐲𝐩𝐞_𝐛 {
     return 𝐭𝐲𝐩𝐞_𝐛(ᵖᵃʳᵃᵐ);
diff --git a/test/tint/unicode/identifiers.wgsl.expected.wgsl b/test/tint/unicode/identifiers.wgsl.expected.wgsl
index e13248f..e51463a 100644
--- a/test/tint/unicode/identifiers.wgsl.expected.wgsl
+++ b/test/tint/unicode/identifiers.wgsl.expected.wgsl
@@ -1,6 +1,6 @@
-type 𝓉𝓎𝓅ℯ_𝒶 = i32;
+alias 𝓉𝓎𝓅ℯ_𝒶 = i32;
 
-type 𝐭𝐲𝐩𝐞_𝐛 = f32;
+alias 𝐭𝐲𝐩𝐞_𝐛 = f32;
 
 fn 𝓯𝓾𝓷𝓬𝓽𝓲𝓸𝓷(ᵖᵃʳᵃᵐ : 𝓉𝓎𝓅ℯ_𝒶) -> 𝐭𝐲𝐩𝐞_𝐛 {
   return 𝐭𝐲𝐩𝐞_𝐛(ᵖᵃʳᵃᵐ);
diff --git a/test/tint/var/inferred/function.wgsl b/test/tint/var/inferred/function.wgsl
index a955cde..2a20719 100644
--- a/test/tint/var/inferred/function.wgsl
+++ b/test/tint/var/inferred/function.wgsl
@@ -2,7 +2,7 @@
     f1 : f32,
 };
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 fn ret_i32() -> i32 { return 1; }
 fn ret_u32() -> u32 { return 1u; }
diff --git a/test/tint/var/inferred/function.wgsl.expected.wgsl b/test/tint/var/inferred/function.wgsl.expected.wgsl
index 7abf40a..9513cb1 100644
--- a/test/tint/var/inferred/function.wgsl.expected.wgsl
+++ b/test/tint/var/inferred/function.wgsl.expected.wgsl
@@ -2,7 +2,7 @@
   f1 : f32,
 }
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 fn ret_i32() -> i32 {
   return 1;
diff --git a/test/tint/var/inferred/global.wgsl b/test/tint/var/inferred/global.wgsl
index 7ddb3e0..627300b 100644
--- a/test/tint/var/inferred/global.wgsl
+++ b/test/tint/var/inferred/global.wgsl
@@ -2,7 +2,7 @@
     f1 : f32,
 };
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 var<private> v1 = 1;
 var<private> v2 = 1u;
diff --git a/test/tint/var/inferred/global.wgsl.expected.wgsl b/test/tint/var/inferred/global.wgsl.expected.wgsl
index bc7132f..3f9032c 100644
--- a/test/tint/var/inferred/global.wgsl.expected.wgsl
+++ b/test/tint/var/inferred/global.wgsl.expected.wgsl
@@ -2,7 +2,7 @@
   f1 : f32,
 }
 
-type MyArray = array<f32, 10>;
+alias MyArray = array<f32, 10>;
 
 var<private> v1 = 1;
 
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
index 663f921..a03307e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
index 2165d5e..d773fef 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
index b5592ba..187e148 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
index 6608739..f3dfa11 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
index 31e0e34..fd47503 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
index b9cc8e2..dc99f22 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 12u>;
+alias Arr = array<strided_arr, 12u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
index 1a714f0..d1badad 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
index 9b23f2a..4778e84 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
index 6afce13..f875ec5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 20u>;
+alias Arr = array<strided_arr, 20u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
index 8db47c1..a68233d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 7u>;
+alias Arr = array<strided_arr, 7u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
index f054a86..50d0bdf 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
index 1dd221f..fa06757 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
index 5ed9acf..d36f424 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
index 8b0be09..74af1d2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
index 0dc3069..ae5f88f 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
index 56f31ad..fcab3ac 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
index 44d84ee..8151ae5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
index e0b1c7d3..123d2f0 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
index a517edc..419eb54 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
index 12131bc..34a932f 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
index efd21d3..ca0b3b2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
index 4763b60..c875918 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
index b4408a6..66a5219 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf2 {
   x_GLF_uniform_int_values : Arr_1,
@@ -29,7 +29,7 @@
   el : u32,
 }
 
-type Arr_2 = array<strided_arr_2, 1u>;
+alias Arr_2 = array<strided_arr_2, 1u>;
 
 struct buf0 {
   x_GLF_uniform_uint_values : Arr_2,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
index 4cd39d2..fae009d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
index dba1df6..fec7af9 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
index 3d8c594..0724c23 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
index d7b593a..f54f11e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -18,7 +18,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
index 3e94de7..c432182 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
index cc7f522..7af86cb 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
index 5887199..b7d14fe 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
index cb8ca0d..b323495 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
index ff986fe..515c1c2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
index a3c7d90..7d60981 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
index b0264c4..e1c8a04 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
index 20f5681..f2539c3 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
index ca9da8c..f0dab08 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
index 94a5965..4dc1842 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
index 528a80e..2285772 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
index 59f25b4..803295a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
index f83ce2e..fcd0eaf 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
index fcd9732..7eea74a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
index cdb1c69..0e090a4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
index cf44a69..e5d8b32 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
index eebd08e..b04774d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
index ebda8b7..5345a18 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
index ec9ebf0..d60a5aa 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
index 738125f..364ba3d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
index 1df2885..fd9acf4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
index 7ea16de8..b5c8afa 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
index 4e2b131..590a32c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
index 0c5a8a5..90053e5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
index b13b024..7cb26b4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
index f7a2b84..4f8109a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
index 20267d8..8da2aac 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
index 4bbbcb3..f472e59 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 18u>;
+alias Arr = array<strided_arr, 18u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
index 6c05483..ec87d76 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
index adc1178..e1f5303 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
index 3e81573..472b553 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
index d50160b..6356f7e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
index 4371470..64778c2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
index f4afbba..8f32af5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
index fc0e8b8..0c9b73a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
index d3de501..ec88712 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
index 45f3802..1c0c634 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
index 8f2685e..88762ec 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
index f4bbc24..bab26ba 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
index 27b58b7..42da207 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
index ed73b3d..782d3b4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
index d6fa70f..57de9b7 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
index e1d317b..e46e3bb 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
index 1e20241..3e129b5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
index abc3671..ab17f79 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
index f38eb8c..ef37f21 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
index b18be7b..da570cc 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
index 85c9c8d..49babb2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
index 5e207fb..f395265 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
index e2a9479..b38329b 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
index e500f0a..473ae8d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
index 9145c24..6a04456 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 7u>;
+alias Arr = array<strided_arr, 7u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
index aeb5009..108fb9b 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
index 5484a46..64d0c21 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
index 149b02d..07b671b 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
index a0d986a..363cad1 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
index c84d5e4..9e1000e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
index 95fa93b..66e196e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
index b194928..90b7ae2 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
index d7f663b..4349583 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
index 01ab459..012c114 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
index 1eaf4f2..b2bfd6c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 12u>;
+alias Arr = array<strided_arr, 12u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
index a1eccf0..d172b43 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
index dea5865..23a08c4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
index 4b06cb6..3076d53 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
index 2a99833..2a43101 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
@@ -11,7 +11,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
index 485b2b7..33249c6 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
index f0040e7..35b0fc6 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
index 3dcdf88..f10fb1a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
index a84b027..1e4440c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
index ec4f450..75e3b66 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
index dc00bca..1f51100 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
index ce1ba21..c914f5e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
index 62b83a1..a42f7e5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
index d98ec27..898aba3 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
index 4d350e0..52360ca 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 6u>;
+alias Arr = array<strided_arr, 6u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
index b202044..d9fb6bb 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
index 8c48e02..d34cc53 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
index bf75f9f..51e4273 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
index 4714145..427e3b0 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
index b59d5b9..0692b1c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
index d71eb46..7f18b44 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
index 6deb5fb..aaf81de 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 6u>;
+alias Arr = array<strided_arr, 6u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
index affe188..9919bc5 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
index b2f11af..3c0c59c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
index ca0b70c..e05ba80 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
index 4162bbf..a0b7567 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
index ba55a80..6247bcc 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
index bba9af1..d493fa0 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
index 2d04059..83fa6ad 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
index ad0688d..99831b9 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
index d56929d..37a870d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf2 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
@@ -25,7 +25,7 @@
   el : u32,
 }
 
-type Arr_2 = array<strided_arr_2, 1u>;
+alias Arr_2 = array<strided_arr_2, 1u>;
 
 struct buf1 {
   x_GLF_uniform_uint_values : Arr_2,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
index fd50f46..ebc9f32 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
index 6713484..b4b1ca6 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
index 32190d7..7cb57ac 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
index d1b7f77..59db2af 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 19u>;
+alias Arr = array<strided_arr, 19u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
index 465d0b6..b474818 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
index 2a4c9b9..0662566 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
index 9c77bd8..2e5e560 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
index 6764ecb..8ecce9a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
index 4a2742d..eb84c4a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
index df6c8dd..4db4865 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
index f17f5b4..ba6d932 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
index 84c096d..10e06e4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
index c3cc736..c3faf4a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
index 2c7406d..8f5ea96 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
index b70b2db..5b453cd 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
index b08467d..25c0e62 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
index efe4f32..421830e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
index 6a680de..aee72b1 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
index 77a2801..f0566c0 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
index b34e84b..1af01ce 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
index 382ffa2..c3290e1 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
index 19f1fab..903cbda 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
index 8c61b22..4ff53a0 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 7u>;
+alias Arr = array<strided_arr, 7u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 3u>;
+alias Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
index d176ddb..7fa7c7a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
index 4c0dd13..0f15e3f 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
index c556495..ae08ac6 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
index 84e0f7b..9b78aec 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
index 1ab7d69..1305c85 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 6u>;
+alias Arr = array<strided_arr, 6u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
index aa340d6..c1a7bb8 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
index 64b0470..8299eca 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
index 23219d0..3a742aea 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
index 47994dc..108bd3d 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
index d2deae4..0ef0cca 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
index a6dfef5..847bab4 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
index bae09d5..6843ea1 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
index 18da3eb..509e011 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -26,7 +26,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
index 63deae6..9179882 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
index 0302149..bbd49df 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
index c882710..c1fa29f 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -18,7 +18,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
index f9c3613..eafec0b 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
@@ -11,7 +11,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 5u>;
+alias Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
index 40362b6..3bcc45b 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
index 2dcba3a..19b3ac7 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
index f25d1e9..40a767a 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
@@ -7,7 +7,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
index 537ce2b..ab5ea1e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : u32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_uint_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1,
@@ -25,7 +25,7 @@
   el : f32,
 }
 
-type Arr_2 = array<strided_arr_2, 3u>;
+alias Arr_2 = array<strided_arr_2, 3u>;
 
 struct buf2 {
   x_GLF_uniform_float_values : Arr_2,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
index 118074c..ac3c1c9 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
index 8418f6e..47f36e8 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
index dfc8799..a641c8c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
index 038cbc5..835968e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 4u>;
+alias Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
index f5b06a9..6d14d1e 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : u32,
 }
 
-type Arr = array<strided_arr, 1u>;
+alias Arr = array<strided_arr, 1u>;
 
 struct buf2 {
   x_GLF_uniform_uint_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
@@ -25,7 +25,7 @@
   el : i32,
 }
 
-type Arr_2 = array<strided_arr_2, 2u>;
+alias Arr_2 = array<strided_arr_2, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_2,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
index 303bed9..1f19fe3 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 16u>;
+alias Arr = array<strided_arr, 16u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
index f94b71c..bbe1dd3 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 2u>;
+alias Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
index fd261db..b62501c 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : u32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_uint_values : Arr,
@@ -14,7 +14,7 @@
   el : f32,
 }
 
-type Arr_1 = array<strided_arr_1, 1u>;
+alias Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf2 {
   x_GLF_uniform_float_values : Arr_1,
@@ -25,7 +25,7 @@
   el : i32,
 }
 
-type Arr_2 = array<strided_arr_2, 2u>;
+alias Arr_2 = array<strided_arr_2, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_2,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
index be96401..7caac20 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
@@ -3,7 +3,7 @@
   el : f32,
 }
 
-type Arr = array<strided_arr, 3u>;
+alias Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr,
@@ -14,7 +14,7 @@
   el : i32,
 }
 
-type Arr_1 = array<strided_arr_1, 4u>;
+alias Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
index 7855268..cabbca7 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
@@ -9,7 +9,7 @@
   el : i32,
 }
 
-type Arr = array<strided_arr, 2u>;
+alias Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr,
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
index d07a278..1d668f6 100644
--- a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<f32>;
+alias RTArr = array<f32>;
 
 struct doesNotMatter {
   x_compute_data : RTArr,
diff --git a/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl b/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
index b516363..a91096a 100644
--- a/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
@@ -1,18 +1,18 @@
-type Arr = array<i32, 8u>;
+alias Arr = array<i32, 8u>;
 
 struct In2 {
   data_in2 : Arr,
 }
 
-type Arr_1 = array<i32, 1024u>;
+alias Arr_1 = array<i32, 1024u>;
 
 struct Out0 {
   data_out0 : Arr_1,
 }
 
-type Arr_2 = array<i32, 512u>;
+alias Arr_2 = array<i32, 512u>;
 
-type Arr_3 = array<i32, 512u>;
+alias Arr_3 = array<i32, 512u>;
 
 struct In1 {
   data_in1 : Arr_3,
diff --git a/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl b/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
index 5e8bbe1..a83bc42 100644
--- a/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
@@ -1,18 +1,18 @@
-type Arr = array<i32, 8u>;
+alias Arr = array<i32, 8u>;
 
 struct In2 {
   data_in2 : Arr,
 }
 
-type Arr_1 = array<i32, 1024u>;
+alias Arr_1 = array<i32, 1024u>;
 
 struct Out0 {
   data_out0 : Arr_1,
 }
 
-type Arr_2 = array<i32, 512u>;
+alias Arr_2 = array<i32, 512u>;
 
-type Arr_3 = array<i32, 512u>;
+alias Arr_3 = array<i32, 512u>;
 
 struct In0 {
   data_in0 : Arr_3,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
index a78ae2c..5571771 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
@@ -2,7 +2,7 @@
   result : i32,
 }
 
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct Buf0 {
   values : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
index b363911..7633d40 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
index bae81f9..de49e5f 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
index 56061a7..de56006 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
index fefb524..5f48ce5 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
index c290487..effc246 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<i32>;
+alias RTArr = array<i32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
index b33c53b..3812c6e 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
index 8817e33..1e4fcbe 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
index e86ba62..3f2e0dc 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
index eade541..9be7eb8 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
index 7958835..4973e94 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
index 7f3aca0..61285b4 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<u32>;
+alias RTArr = array<u32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
index 472f453..c218384 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<i32>;
+alias RTArr = array<i32>;
 
 struct S {
   field0 : RTArr,
diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
index 2cdb543..2d95cd4 100644
--- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
+++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
@@ -1,4 +1,4 @@
-type RTArr = array<i32>;
+alias RTArr = array<i32>;
 
 struct S {
   field0 : RTArr,