[gl] Move symbol renaming into the backend

Instead of running the AST renamer transform in Dawn's OpenGL backend,
we just modify the names when emitting them in the printer.

This is a little cleaner than using a transform, as transforms cannot
rename structures and struct members without requiring
const_cast. This also keeps the list of GLSL keywords local to the
printer, and means we can retain the meaningful names throughout the
`raise` process.

Bug: 380043958
Fixed: 42241122
Change-Id: If388c9456d413899f8546eb24cff7819e7caf146
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/218619
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: James Price <jrprice@google.com>
diff --git a/src/dawn/native/opengl/ShaderModuleGL.cpp b/src/dawn/native/opengl/ShaderModuleGL.cpp
index 5750d3a..1b63fee 100644
--- a/src/dawn/native/opengl/ShaderModuleGL.cpp
+++ b/src/dawn/native/opengl/ShaderModuleGL.cpp
@@ -477,7 +477,7 @@
         }
     }
 
-    req.disableSymbolRenaming = GetDevice()->IsToggleEnabled(Toggle::DisableSymbolRenaming);
+    req.tintOptions.strip_all_names = !GetDevice()->IsToggleEnabled(Toggle::DisableSymbolRenaming);
 
     req.interstageVariables = {};
     for (size_t i = 0; i < entryPointMetaData.interStageVariables.size(); i++) {
@@ -495,26 +495,12 @@
     DAWN_TRY_LOAD_OR_RUN(
         compilationResult, GetDevice(), std::move(req), GLSLCompilation::FromBlob,
         [](GLSLCompilationRequest r) -> ResultOrError<GLSLCompilation> {
-            constexpr char kRemappedEntryPointName[] = "dawn_entry_point";
             tint::ast::transform::Manager transformManager;
             tint::ast::transform::DataMap transformInputs;
 
             transformManager.Add<tint::ast::transform::SingleEntryPoint>();
             transformInputs.Add<tint::ast::transform::SingleEntryPoint::Config>(r.entryPointName);
 
-            {
-                tint::ast::transform::Renamer::Remappings assignedRenamings = {
-                    {r.entryPointName, kRemappedEntryPointName}};
-
-                // Needs to run early so that they can use builtin names safely.
-                // TODO(dawn:2180): move this transform into Tint.
-                transformManager.Add<tint::ast::transform::Renamer>();
-                transformInputs.Add<tint::ast::transform::Renamer::Config>(
-                    r.disableSymbolRenaming ? tint::ast::transform::Renamer::Target::kGlslKeywords
-                                            : tint::ast::transform::Renamer::Target::kAll,
-                    std::move(assignedRenamings));
-            }
-
             if (r.substituteOverrideConfig) {
                 // This needs to run after SingleEntryPoint transform which removes unused overrides
                 // for current entry point.
diff --git a/src/tint/cmd/tint/main.cc b/src/tint/cmd/tint/main.cc
index d47cacd..b8f80a0 100644
--- a/src/tint/cmd/tint/main.cc
+++ b/src/tint/cmd/tint/main.cc
@@ -605,11 +605,7 @@
             break;
         }
         case Format::kGlsl: {
-            if (!options.rename_all) {
-                transform_inputs.Add<tint::ast::transform::Renamer::Config>(
-                    tint::ast::transform::Renamer::Target::kGlslKeywords);
-            }
-            transform_manager.Add<tint::ast::transform::Renamer>();
+            // Renaming is handled in the backend.
             break;
         }
         case Format::kHlsl:
@@ -1144,6 +1140,7 @@
     }
 
     tint::glsl::writer::Options gen_options;
+    gen_options.strip_all_names = options.rename_all;
     if (options.glsl_desktop) {
         gen_options.version =
             tint::glsl::writer::Version(tint::glsl::writer::Version::Standard::kDesktop, 4, 6);
diff --git a/src/tint/lang/glsl/writer/BUILD.bazel b/src/tint/lang/glsl/writer/BUILD.bazel
index ca8844a..1a91748 100644
--- a/src/tint/lang/glsl/writer/BUILD.bazel
+++ b/src/tint/lang/glsl/writer/BUILD.bazel
@@ -95,6 +95,7 @@
     "type_test.cc",
     "unary_test.cc",
     "var_and_let_test.cc",
+    "writer_test.cc",
   ] + select({
     ":tint_build_glsl_validator": [
       "helper_test.h",
diff --git a/src/tint/lang/glsl/writer/BUILD.cmake b/src/tint/lang/glsl/writer/BUILD.cmake
index 1ddb430..1a9088b 100644
--- a/src/tint/lang/glsl/writer/BUILD.cmake
+++ b/src/tint/lang/glsl/writer/BUILD.cmake
@@ -107,6 +107,7 @@
   lang/glsl/writer/type_test.cc
   lang/glsl/writer/unary_test.cc
   lang/glsl/writer/var_and_let_test.cc
+  lang/glsl/writer/writer_test.cc
 )
 
 tint_target_add_dependencies(tint_lang_glsl_writer_test test
diff --git a/src/tint/lang/glsl/writer/BUILD.gn b/src/tint/lang/glsl/writer/BUILD.gn
index 7acabd4..95084ac 100644
--- a/src/tint/lang/glsl/writer/BUILD.gn
+++ b/src/tint/lang/glsl/writer/BUILD.gn
@@ -99,6 +99,7 @@
         "type_test.cc",
         "unary_test.cc",
         "var_and_let_test.cc",
+        "writer_test.cc",
       ]
       deps = [
         "${dawn_root}/src/utils:utils",
diff --git a/src/tint/lang/glsl/writer/builtin_test.cc b/src/tint/lang/glsl/writer/builtin_test.cc
index a779587..1aeae0a 100644
--- a/src/tint/lang/glsl/writer/builtin_test.cc
+++ b/src/tint/lang/glsl/writer/builtin_test.cc
@@ -1560,15 +1560,15 @@
     EXPECT_EQ(output_.glsl, GlslHeader() + R"(
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 float foo(float value) {
   modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(value, v.whole);
+  v.member_0 = modf(value, v.whole);
   modf_result_f32 v_1 = v;
-  return (v_1.fract + v_1.whole);
+  return (v_1.member_0 + v_1.whole);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
@@ -1592,15 +1592,15 @@
     EXPECT_EQ(output_.glsl, GlslHeader() + R"(
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
 vec4 foo(vec4 value) {
   modf_result_vec4_f32 v = modf_result_vec4_f32(vec4(0.0f), vec4(0.0f));
-  v.fract = modf(value, v.whole);
+  v.member_0 = modf(value, v.whole);
   modf_result_vec4_f32 v_1 = v;
-  return (v_1.fract + v_1.whole);
+  return (v_1.member_0 + v_1.whole);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
@@ -1624,15 +1624,15 @@
     EXPECT_EQ(output_.glsl, GlslHeader() + R"(
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 float foo(float value) {
   frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(value, v.exp);
+  v.member_0 = frexp(value, v.member_1);
   frexp_result_f32 v_1 = v;
-  return (v_1.fract + float(v_1.exp));
+  return (v_1.member_0 + float(v_1.member_1));
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
@@ -1656,15 +1656,15 @@
     EXPECT_EQ(output_.glsl, GlslHeader() + R"(
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 vec4 foo(vec4 value) {
   frexp_result_vec4_f32 v = frexp_result_vec4_f32(vec4(0.0f), ivec4(0));
-  v.fract = frexp(value, v.exp);
+  v.member_0 = frexp(value, v.member_1);
   frexp_result_vec4_f32 v_1 = v;
-  return (v_1.fract + vec4(v_1.exp));
+  return (v_1.member_0 + vec4(v_1.member_1));
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/src/tint/lang/glsl/writer/common/options.h b/src/tint/lang/glsl/writer/common/options.h
index 0fdab12..c12c7b1 100644
--- a/src/tint/lang/glsl/writer/common/options.h
+++ b/src/tint/lang/glsl/writer/common/options.h
@@ -247,6 +247,9 @@
     /// Copy constructor
     Options(const Options&);
 
+    /// Set to `true` to strip all user-declared identifiers from the module.
+    bool strip_all_names = false;
+
     /// Set to `true` to disable software robustness that prevents out-of-bounds accesses.
     bool disable_robustness = false;
 
@@ -276,6 +279,7 @@
 
     /// Reflect the fields of this class so that it can be used by tint::ForeachField()
     TINT_REFLECT(Options,
+                 strip_all_names,
                  disable_robustness,
                  disable_workgroup_init,
                  disable_polyfill_integer_div_mod,
diff --git a/src/tint/lang/glsl/writer/printer/printer.cc b/src/tint/lang/glsl/writer/printer/printer.cc
index fa208c3..3cda793 100644
--- a/src/tint/lang/glsl/writer/printer/printer.cc
+++ b/src/tint/lang/glsl/writer/printer/printer.cc
@@ -107,6 +107,15 @@
     kStd430,
 };
 
+/// Retrieve the gl_ string corresponding to a builtin.
+/// @param builtin the builtin
+/// @param address_space the address space (input or output)
+/// @returns the gl_ string corresponding to that builtin
+const char* GLSLBuiltinToString(core::BuiltinValue builtin, core::AddressSpace address_space);
+
+/// @returns true if @p ident is a GLSL keyword that needs to be avoided
+bool IsKeyword(std::string_view ident);
+
 /// PIMPL class for the MSL generator
 class Printer : public tint::TextGenerator {
   public:
@@ -190,7 +199,7 @@
     Hashset<std::string, 4> emitted_extensions_;
 
     /// A hashmap of value to name
-    Hashmap<const core::ir::Value*, std::string, 32> names_;
+    Hashmap<const CastableBase*, std::string, 32> names_;
 
     /// Map of builtin structure to unique generated name
     Hashmap<const core::type::Struct*, std::string, 4> builtin_struct_names_;
@@ -210,12 +219,32 @@
     /// Block to emit for a continuing
     std::function<void()> emit_continuing_;
 
+    /// @returns `true` if @p ident should be renamed
+    bool ShouldRename(std::string_view ident) {
+        return options_.strip_all_names || IsKeyword(ident) || !tint::utf8::IsASCII(ident);
+    }
+
     /// @returns the name of the given value, creating a new unique name if the value is unnamed in
     /// the module.
     std::string NameOf(const core::ir::Value* value) {
         return names_.GetOrAdd(value, [&] {
             auto sym = ir_.NameOf(value);
-            return sym.IsValid() ? sym.Name() : UniqueIdentifier("v");
+            if (!sym || ShouldRename(sym.NameView())) {
+                return UniqueIdentifier("v");
+            }
+            return sym.Name();
+        });
+    }
+
+    /// @param m the struct member
+    /// @returns the name to use for the struct member
+    std::string NameOf(const core::type::StructMember* m) {
+        return names_.GetOrAdd(m, [&] {
+            auto name = m->Name().Name();
+            if (ShouldRename(name)) {
+                return "member_" + std::to_string(m->Index());
+            }
+            return name;
         });
     }
 
@@ -231,12 +260,17 @@
     /// with double underscores. If the structure is a builtin, then the returned name will be a
     /// unique name without the leading underscores.
     std::string StructName(const core::type::Struct* s) {
-        auto name = s->Name().Name();
-        if (HasPrefix(name, "__")) {
-            name =
-                builtin_struct_names_.GetOrAdd(s, [&] { return UniqueIdentifier(name.substr(2)); });
-        }
-        return name;
+        return names_.GetOrAdd(s, [&] {
+            auto name = s->Name().Name();
+            if (HasPrefix(name, "__")) {
+                name = builtin_struct_names_.GetOrAdd(
+                    s, [&] { return UniqueIdentifier(name.substr(2)); });
+            }
+            if (ShouldRename(name)) {
+                return UniqueIdentifier("tint_struct");
+            }
+            return name;
+        });
     }
 
     /// Find all structures that are used in host-shareable address spaces and mark them as such so
@@ -317,10 +351,10 @@
             // Switch the entry point name to `main`. This makes the assumption that single entry
             // point is always run for GLSL, which is has to be, there can be only one entry point.
             // So, we swap the entry point name to `main` which is required for GLSL.
-            if (func->Stage() != core::ir::Function::PipelineStage::kUndefined) {
+            if (func->IsEntryPoint()) {
                 out << "main";
             } else {
-                out << ir_.NameOf(func).Name();
+                out << NameOf(func);
             }
 
             out << "(";
@@ -570,7 +604,7 @@
                 [&](const core::type::Struct* s) {
                     auto* c = index->As<core::ir::Constant>();
                     auto* member = s->Members()[c->Value()->ValueAs<uint32_t>()];
-                    out << "." << member->Name().Name();
+                    out << "." << NameOf(member);
                     current_type = member->Type();
                 },
                 [&](const core::type::Vector*) {  //
@@ -724,7 +758,7 @@
                 }
             }
 
-            EmitTypeAndName(out, mem->Type(), mem->Name().Name());
+            EmitTypeAndName(out, mem->Type(), NameOf(mem));
             out << ";";
 
             new_struct_to_old.Push(mem->Index());
@@ -1056,9 +1090,23 @@
     }
 
     void EmitPushConstantVar(core::ir::Var* var) {
+        // We need to use the same name for the push constant structure and variable between
+        // different pipeline stages.
+        constexpr const char* kPushConstantStructName = "tint_push_constant_struct";
+        constexpr const char* kPushConstantVarName = "tint_push_constants";
+
         auto out = Line();
         EmitLayoutLocation(out, {0}, std::nullopt);
-        EmitVar(out, var);
+
+        auto* ptr = var->Result(0)->Type()->As<core::type::Pointer>();
+        auto* str = ptr->StoreType()->As<core::type::Struct>();
+        TINT_ASSERT(str);
+        names_.Add(str, kPushConstantStructName);
+        EmitStructType(str);
+
+        names_.Add(var->Result(0), kPushConstantVarName);
+        EmitTypeAndName(out, var->Result(0)->Type(), kPushConstantVarName);
+        out << ";";
     }
 
     void EmitIOVar(core::ir::Var* var) {
@@ -1072,7 +1120,9 @@
                 EmitExtension(kOESSampleVariables);
             }
 
-            // Do not emit builtin (gl_) variables.
+            // Do not emit builtin (gl_) variables, but register the GLSL builtin names so that they
+            // are correct at the point of use.
+            names_.Add(var->Result(0), GLSLBuiltinToString(*attrs.builtin, addrspace));
             return;
         } else if (attrs.location) {
             // Use a fixed naming scheme for interstage variables so that they match between vertex
@@ -1798,6 +1848,419 @@
     }
 };
 
+const char* GLSLBuiltinToString(core::BuiltinValue builtin, core::AddressSpace address_space) {
+    switch (builtin) {
+        case core::BuiltinValue::kPosition: {
+            if (address_space == core::AddressSpace::kOut) {
+                return "gl_Position";
+            }
+            if (address_space == core::AddressSpace::kIn) {
+                return "gl_FragCoord";
+            }
+            TINT_UNREACHABLE();
+        }
+        case core::BuiltinValue::kVertexIndex:
+            return "gl_VertexID";
+        case core::BuiltinValue::kInstanceIndex:
+            return "gl_InstanceID";
+        case core::BuiltinValue::kFrontFacing:
+            return "gl_FrontFacing";
+        case core::BuiltinValue::kFragDepth:
+            return "gl_FragDepth";
+        case core::BuiltinValue::kLocalInvocationId:
+            return "gl_LocalInvocationID";
+        case core::BuiltinValue::kLocalInvocationIndex:
+            return "gl_LocalInvocationIndex";
+        case core::BuiltinValue::kGlobalInvocationId:
+            return "gl_GlobalInvocationID";
+        case core::BuiltinValue::kNumWorkgroups:
+            return "gl_NumWorkGroups";
+        case core::BuiltinValue::kWorkgroupId:
+            return "gl_WorkGroupID";
+        case core::BuiltinValue::kSampleIndex:
+            return "gl_SampleID";
+        case core::BuiltinValue::kSampleMask: {
+            if (address_space == core::AddressSpace::kIn) {
+                return "gl_SampleMaskIn";
+            } else {
+                return "gl_SampleMask";
+            }
+            TINT_UNREACHABLE();
+        }
+        case core::BuiltinValue::kPointSize:
+            return "gl_PointSize";
+        default:
+            TINT_UNREACHABLE();
+    }
+}
+
+// This list is used for a binary search and must be kept in sorted order.
+const char* const kReservedKeywordsGLSL[] = {
+    "abs",
+    "acos",
+    "acosh",
+    "active",
+    "all",
+    "any",
+    "asin",
+    "asinh",
+    "asm",
+    "atan",
+    "atanh",
+    "atomicAdd",
+    "atomicAnd",
+    "atomicCompSwap",
+    "atomicCounter",
+    "atomicCounterDecrement",
+    "atomicCounterIncrement",
+    "atomicExchange",
+    "atomicMax",
+    "atomicMin",
+    "atomicOr",
+    "atomicXor",
+    "atomic_uint",
+    "attribute",
+    "barrier",
+    "bitCount",
+    "bitfieldExtract",
+    "bitfieldInsert",
+    "bitfieldReverse",
+    "bool",
+    "break",
+    "buffer",
+    "bvec2",
+    "bvec3",
+    "bvec4",
+    "case",
+    "cast",
+    "ceil",
+    "centroid",
+    "clamp",
+    "class",
+    "coherent",
+    "common",
+    "const",
+    "continue",
+    "cos",
+    "cosh",
+    "cross",
+    "dFdx",
+    "dFdy",
+    "default",
+    "degrees",
+    "determinant",
+    "discard",
+    "distance",
+    "dmat2",
+    "dmat2x2",
+    "dmat2x3",
+    "dmat2x4",
+    "dmat3",
+    "dmat3x2",
+    "dmat3x3",
+    "dmat3x4",
+    "dmat4",
+    "dmat4x2",
+    "dmat4x3",
+    "dmat4x4",
+    "do",
+    "dot",
+    "double",
+    "dvec2",
+    "dvec3",
+    "dvec4",
+    "else",
+    "enum",
+    "equal",
+    "exp",
+    "exp2",
+    "extern",
+    "external",
+    "faceforward",
+    "false",
+    "filter",
+    "findLSB",
+    "findMSB",
+    "fixed",
+    "flat",
+    "float",
+    "floatBitsToInt",
+    "floatBitsToUint",
+    "floor",
+    "for",
+    "fract",
+    "frexp",
+    "fvec2",
+    "fvec3",
+    "fvec4",
+    "fwidth",
+    "gl_BaseInstance",
+    "gl_BaseVertex",
+    "gl_ClipDistance",
+    "gl_DepthRangeParameters",
+    "gl_DrawID",
+    "gl_FragCoord",
+    "gl_FragDepth",
+    "gl_FrontFacing",
+    "gl_GlobalInvocationID",
+    "gl_InstanceID",
+    "gl_LocalInvocationID",
+    "gl_LocalInvocationIndex",
+    "gl_NumSamples",
+    "gl_NumWorkGroups",
+    "gl_PerVertex",
+    "gl_PointCoord",
+    "gl_PointSize",
+    "gl_Position",
+    "gl_PrimitiveID",
+    "gl_SampleID",
+    "gl_SampleMask",
+    "gl_SampleMaskIn",
+    "gl_SamplePosition",
+    "gl_VertexID",
+    "gl_WorkGroupID",
+    "gl_WorkGroupSize",
+    "goto",
+    "greaterThan",
+    "greaterThanEqual",
+    "groupMemoryBarrier",
+    "half",
+    "highp",
+    "hvec2",
+    "hvec3",
+    "hvec4",
+    "if",
+    "iimage1D",
+    "iimage1DArray",
+    "iimage2D",
+    "iimage2DArray",
+    "iimage2DMS",
+    "iimage2DMSArray",
+    "iimage2DRect",
+    "iimage3D",
+    "iimageBuffer",
+    "iimageCube",
+    "iimageCubeArray",
+    "image1D",
+    "image1DArray",
+    "image2D",
+    "image2DArray",
+    "image2DMS",
+    "image2DMSArray",
+    "image2DRect",
+    "image3D",
+    "imageBuffer",
+    "imageCube",
+    "imageCubeArray",
+    "imageLoad",
+    "imageSize",
+    "imageStore",
+    "imulExtended",
+    "in",
+    "inline",
+    "inout",
+    "input",
+    "int",
+    "intBitsToFloat",
+    "interface",
+    "invariant",
+    "inverse",
+    "inversesqrt",
+    "isampler1D",
+    "isampler1DArray",
+    "isampler2D",
+    "isampler2DArray",
+    "isampler2DMS",
+    "isampler2DMSArray",
+    "isampler2DRect",
+    "isampler3D",
+    "isamplerBuffer",
+    "isamplerCube",
+    "isamplerCubeArray",
+    "isinf",
+    "isnan",
+    "ivec2",
+    "ivec3",
+    "ivec4",
+    "layout",
+    "ldexp",
+    "length",
+    "lessThan",
+    "lessThanEqual",
+    "log",
+    "log2",
+    "long",
+    "lowp",
+    "main",
+    "mat2",
+    "mat2x2",
+    "mat2x3",
+    "mat2x4",
+    "mat3",
+    "mat3x2",
+    "mat3x3",
+    "mat3x4",
+    "mat4",
+    "mat4x2",
+    "mat4x3",
+    "mat4x4",
+    "matrixCompMult",
+    "max",
+    "mediump",
+    "memoryBarrier",
+    "memoryBarrierAtomicCounter",
+    "memoryBarrierBuffer",
+    "memoryBarrierImage",
+    "memoryBarrierShared",
+    "min",
+    "mix",
+    "mod",
+    "modf",
+    "namespace",
+    "noinline",
+    "non_coherent",
+    "noncoherent",
+    "noperspective",
+    "normalize",
+    "not",
+    "notEqual",
+    "out",
+    "outerProduct",
+    "output",
+    "packHalf2x16",
+    "packSnorm2x16",
+    "packSnorm4x8",
+    "packUnorm2x16",
+    "packUnorm4x8",
+    "partition",
+    "patch",
+    "pow",
+    "precise",
+    "precision",
+    "public",
+    "radians",
+    "readonly",
+    "reflect",
+    "refract",
+    "resource",
+    "restrict",
+    "return",
+    "round",
+    "roundEven",
+    "sample",
+    "sampler1D",
+    "sampler1DArray",
+    "sampler1DArrayShadow",
+    "sampler1DShadow",
+    "sampler2D",
+    "sampler2DArray",
+    "sampler2DArrayShadow",
+    "sampler2DMS",
+    "sampler2DMSArray",
+    "sampler2DRect",
+    "sampler2DRectShadow",
+    "sampler2DShadow",
+    "sampler3D",
+    "sampler3DRect",
+    "samplerBuffer",
+    "samplerCube",
+    "samplerCubeArray",
+    "samplerCubeArrayShadow",
+    "samplerCubeShadow",
+    "shared",
+    "short",
+    "sign",
+    "sin",
+    "sinh",
+    "sizeof",
+    "smooth",
+    "smoothstep",
+    "sqrt",
+    "static",
+    "step",
+    "struct",
+    "subroutine",
+    "superp",
+    "switch",
+    "tan",
+    "tanh",
+    "template",
+    "texelFetch",
+    "texelFetchOffset",
+    "texture",
+    "textureGather",
+    "textureGatherOffset",
+    "textureGrad",
+    "textureGradOffset",
+    "textureLod",
+    "textureLodOffset",
+    "textureOffset",
+    "textureProj",
+    "textureProjGrad",
+    "textureProjGradOffset",
+    "textureProjLod",
+    "textureProjLodOffset",
+    "textureProjOffset",
+    "textureSize",
+    "this",
+    "transpose",
+    "true",
+    "trunc",
+    "typedef",
+    "uaddCarry",
+    "uimage1D",
+    "uimage1DArray",
+    "uimage2D",
+    "uimage2DArray",
+    "uimage2DMS",
+    "uimage2DMSArray",
+    "uimage2DRect",
+    "uimage3D",
+    "uimageBuffer",
+    "uimageCube",
+    "uimageCubeArray",
+    "uint",
+    "uintBitsToFloat",
+    "umulExtended",
+    "uniform",
+    "union",
+    "unpackHalf2x16",
+    "unpackSnorm2x16",
+    "unpackSnorm4x8",
+    "unpackUnorm2x16",
+    "unpackUnorm4x8",
+    "unsigned",
+    "usampler1D",
+    "usampler1DArray",
+    "usampler2D",
+    "usampler2DArray",
+    "usampler2DMS",
+    "usampler2DMSArray",
+    "usampler2DRect",
+    "usampler3D",
+    "usamplerBuffer",
+    "usamplerCube",
+    "usamplerCubeArray",
+    "using",
+    "usubBorrow",
+    "uvec2",
+    "uvec3",
+    "uvec4",
+    "varying",
+    "vec2",
+    "vec3",
+    "vec4",
+    "void",
+    "volatile",
+    "while",
+    "writeonly",
+};
+bool IsKeyword(std::string_view ident) {
+    return std::binary_search(std::begin(kReservedKeywordsGLSL), std::end(kReservedKeywordsGLSL),
+                              ident) ||
+           ident.compare(0, 3, "gl_") == 0 || ident.find("__") != std::string::npos;
+}
+
 }  // namespace
 
 Result<Output> Print(core::ir::Module& module, const Options& options) {
diff --git a/src/tint/lang/glsl/writer/raise/shader_io.cc b/src/tint/lang/glsl/writer/raise/shader_io.cc
index 5e75180..1200743 100644
--- a/src/tint/lang/glsl/writer/raise/shader_io.cc
+++ b/src/tint/lang/glsl/writer/raise/shader_io.cc
@@ -64,56 +64,6 @@
     /// Destructor
     ~StateImpl() override {}
 
-    /// Retrieve the gl_ string corresponding to a builtin.
-    /// @param builtin the builtin
-    /// @param address_space the address space (input or output)
-    /// @returns the gl_ string corresponding to that builtin
-    const char* GLSLBuiltinToString(core::BuiltinValue builtin, core::AddressSpace address_space) {
-        switch (builtin) {
-            case core::BuiltinValue::kPosition: {
-                if (address_space == core::AddressSpace::kOut) {
-                    return "gl_Position";
-                }
-                if (address_space == core::AddressSpace::kIn) {
-                    return "gl_FragCoord";
-                }
-                TINT_UNREACHABLE();
-            }
-            case core::BuiltinValue::kVertexIndex:
-                return "gl_VertexID";
-            case core::BuiltinValue::kInstanceIndex:
-                return "gl_InstanceID";
-            case core::BuiltinValue::kFrontFacing:
-                return "gl_FrontFacing";
-            case core::BuiltinValue::kFragDepth:
-                return "gl_FragDepth";
-            case core::BuiltinValue::kLocalInvocationId:
-                return "gl_LocalInvocationID";
-            case core::BuiltinValue::kLocalInvocationIndex:
-                return "gl_LocalInvocationIndex";
-            case core::BuiltinValue::kGlobalInvocationId:
-                return "gl_GlobalInvocationID";
-            case core::BuiltinValue::kNumWorkgroups:
-                return "gl_NumWorkGroups";
-            case core::BuiltinValue::kWorkgroupId:
-                return "gl_WorkGroupID";
-            case core::BuiltinValue::kSampleIndex:
-                return "gl_SampleID";
-            case core::BuiltinValue::kSampleMask: {
-                if (address_space == core::AddressSpace::kIn) {
-                    return "gl_SampleMaskIn";
-                } else {
-                    return "gl_SampleMask";
-                }
-                TINT_UNREACHABLE();
-            }
-            case core::BuiltinValue::kPointSize:
-                return "gl_PointSize";
-            default:
-                TINT_UNREACHABLE();
-        }
-    }
-
     /// Declare a global variable for each IO entry listed in @p entries.
     /// @param vars the list of variables
     /// @param entries the entries to emit
@@ -127,11 +77,10 @@
                   const char* name_suffix) {
         for (auto io : entries) {
             StringStream name;
+            name << ir.NameOf(func).Name();
 
             const core::type::MemoryView* ptr = nullptr;
             if (io.attributes.builtin) {
-                name << GLSLBuiltinToString(*io.attributes.builtin, addrspace);
-
                 switch (io.attributes.builtin.value()) {
                     case core::BuiltinValue::kSampleMask:
                         ptr = ty.ptr(addrspace, ty.array(ty.i32(), 1), access);
@@ -145,8 +94,8 @@
                         ptr = ty.ptr(addrspace, io.type, access);
                         break;
                 }
+                name << "_" << *io.attributes.builtin;
             } else {
-                name << ir.NameOf(func).Name();
                 auto* type = io.type;
 
                 if (io.attributes.location) {
diff --git a/src/tint/lang/glsl/writer/raise/shader_io_test.cc b/src/tint/lang/glsl/writer/raise/shader_io_test.cc
index 75f0eee..b1046c7 100644
--- a/src/tint/lang/glsl/writer/raise/shader_io_test.cc
+++ b/src/tint/lang/glsl/writer/raise/shader_io_test.cc
@@ -108,8 +108,8 @@
 
     auto* expect = R"(
 $B1: {  # root
-  %gl_FrontFacing:ptr<__in, bool, read> = var @builtin(front_facing)
-  %gl_FragCoord:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
+  %foo_front_facing:ptr<__in, bool, read> = var @builtin(front_facing)
+  %foo_position:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
   %foo_loc0_Input:ptr<__in, f32, read> = var @location(0)
   %foo_loc1_Input:ptr<__in, f32, read> = var @location(1) @interpolate(linear, sample)
 }
@@ -128,8 +128,8 @@
 }
 %foo = @fragment func():void {
   $B4: {
-    %13:bool = load %gl_FrontFacing
-    %14:vec4<f32> = load %gl_FragCoord
+    %13:bool = load %foo_front_facing
+    %14:vec4<f32> = load %foo_position
     %15:f32 = load %foo_loc0_Input
     %16:f32 = load %foo_loc1_Input
     %17:void = call %foo_inner, %13, %14, %15, %16
@@ -255,8 +255,8 @@
 }
 
 $B1: {  # root
-  %gl_FrontFacing:ptr<__in, bool, read> = var @builtin(front_facing)
-  %gl_FragCoord:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
+  %foo_front_facing:ptr<__in, bool, read> = var @builtin(front_facing)
+  %foo_position:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
   %foo_loc0_Input:ptr<__in, f32, read> = var @location(0)
   %foo_loc1_Input:ptr<__in, f32, read> = var @location(1) @interpolate(linear, sample)
 }
@@ -279,8 +279,8 @@
 }
 %foo = @fragment func():void {
   $B4: {
-    %14:bool = load %gl_FrontFacing
-    %15:vec4<f32> = load %gl_FragCoord
+    %14:bool = load %foo_front_facing
+    %15:vec4<f32> = load %foo_position
     %16:f32 = load %foo_loc0_Input
     %17:f32 = load %foo_loc1_Input
     %18:Inputs = construct %14, %15, %16, %17
@@ -379,8 +379,8 @@
 }
 
 $B1: {  # root
-  %gl_FrontFacing:ptr<__in, bool, read> = var @builtin(front_facing)
-  %gl_FragCoord:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
+  %foo_front_facing:ptr<__in, bool, read> = var @builtin(front_facing)
+  %foo_position:ptr<__in, vec4<f32>, read> = var @invariant @builtin(position)
   %foo_loc0_Input:ptr<__in, f32, read> = var @location(0)
   %foo_loc1_Input:ptr<__in, f32, read> = var @location(1) @interpolate(linear, sample)
 }
@@ -401,8 +401,8 @@
 }
 %foo = @fragment func():void {
   $B4: {
-    %14:bool = load %gl_FrontFacing
-    %15:vec4<f32> = load %gl_FragCoord
+    %14:bool = load %foo_front_facing
+    %15:vec4<f32> = load %foo_position
     %16:f32 = load %foo_loc0_Input
     %17:Inputs = construct %15, %16
     %18:f32 = load %foo_loc1_Input
@@ -441,8 +441,8 @@
 
     auto* expect = R"(
 $B1: {  # root
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %foo_position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
+  %foo___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
 }
 
 %foo_inner = func():vec4<f32> {
@@ -454,16 +454,16 @@
 %foo = @vertex func():void {
   $B3: {
     %6:vec4<f32> = call %foo_inner
-    store %gl_Position, %6
-    %7:f32 = swizzle %gl_Position, y
+    store %foo_position, %6
+    %7:f32 = swizzle %foo_position, y
     %8:f32 = negation %7
-    store_vector_element %gl_Position, 1u, %8
-    %9:f32 = swizzle %gl_Position, z
-    %10:f32 = swizzle %gl_Position, w
+    store_vector_element %foo_position, 1u, %8
+    %9:f32 = swizzle %foo_position, z
+    %10:f32 = swizzle %foo_position, w
     %11:f32 = mul 2.0f, %9
     %12:f32 = sub %11, %10
-    store_vector_element %gl_Position, 2u, %12
-    store %gl_PointSize, 1.0f
+    store_vector_element %foo_position, 2u, %12
+    store %foo___point_size, 1.0f
     ret
   }
 }
@@ -599,10 +599,10 @@
 }
 
 $B1: {  # root
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
+  %foo_position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
   %foo_loc0_Output:ptr<__out, f32, write> = var @location(0)
   %foo_loc1_Output:ptr<__out, f32, write> = var @location(1) @interpolate(linear, sample)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %foo___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
 }
 
 %foo_inner = func():Outputs {
@@ -616,20 +616,20 @@
   $B3: {
     %9:Outputs = call %foo_inner
     %10:vec4<f32> = access %9, 0u
-    store %gl_Position, %10
-    %11:f32 = swizzle %gl_Position, y
+    store %foo_position, %10
+    %11:f32 = swizzle %foo_position, y
     %12:f32 = negation %11
-    store_vector_element %gl_Position, 1u, %12
-    %13:f32 = swizzle %gl_Position, z
-    %14:f32 = swizzle %gl_Position, w
+    store_vector_element %foo_position, 1u, %12
+    %13:f32 = swizzle %foo_position, z
+    %14:f32 = swizzle %foo_position, w
     %15:f32 = mul 2.0f, %13
     %16:f32 = sub %15, %14
-    store_vector_element %gl_Position, 2u, %16
+    store_vector_element %foo_position, 2u, %16
     %17:f32 = access %9, 1u
     store %foo_loc0_Output, %17
     %18:f32 = access %9, 2u
     store %foo_loc1_Output, %18
-    store %gl_PointSize, 1.0f
+    store %foo___point_size, 1.0f
     ret
   }
 }
@@ -818,10 +818,10 @@
 }
 
 $B1: {  # root
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @builtin(position)
+  %vert_position:ptr<__out, vec4<f32>, write> = var @builtin(position)
   %vert_loc0_Output:ptr<__out, vec4<f32>, write> = var @location(0)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
-  %gl_FragCoord:ptr<__in, vec4<f32>, read> = var @builtin(position)
+  %vert___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
+  %frag_position:ptr<__in, vec4<f32>, read> = var @builtin(position)
   %frag_loc0_Input:ptr<__in, vec4<f32>, read> = var @location(0)
   %frag_loc0_Output:ptr<__out, vec4<f32>, write> = var @location(0)
 }
@@ -846,24 +846,24 @@
   $B4: {
     %17:Interface = call %vert_inner
     %18:vec4<f32> = access %17, 0u
-    store %gl_Position, %18
-    %19:f32 = swizzle %gl_Position, y
+    store %vert_position, %18
+    %19:f32 = swizzle %vert_position, y
     %20:f32 = negation %19
-    store_vector_element %gl_Position, 1u, %20
-    %21:f32 = swizzle %gl_Position, z
-    %22:f32 = swizzle %gl_Position, w
+    store_vector_element %vert_position, 1u, %20
+    %21:f32 = swizzle %vert_position, z
+    %22:f32 = swizzle %vert_position, w
     %23:f32 = mul 2.0f, %21
     %24:f32 = sub %23, %22
-    store_vector_element %gl_Position, 2u, %24
+    store_vector_element %vert_position, 2u, %24
     %25:vec4<f32> = access %17, 1u
     store %vert_loc0_Output, %25
-    store %gl_PointSize, 1.0f
+    store %vert___point_size, 1.0f
     ret
   }
 }
 %frag = @fragment func():void {
   $B5: {
-    %27:vec4<f32> = load %gl_FragCoord
+    %27:vec4<f32> = load %frag_position
     %28:vec4<f32> = load %frag_loc0_Input
     %29:Interface = construct %27, %28
     %30:vec4<f32> = call %frag_inner, %29
@@ -948,9 +948,9 @@
 
 $B1: {  # root
   %1:ptr<storage, Outputs, read> = var @binding_point(0, 0)
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @builtin(position)
+  %vert_position:ptr<__out, vec4<f32>, write> = var @builtin(position)
   %vert_loc0_Output:ptr<__out, vec4<f32>, write> = var @location(0)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %vert___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
 }
 
 %vert_inner = func():Outputs {
@@ -963,18 +963,18 @@
   $B3: {
     %8:Outputs = call %vert_inner
     %9:vec4<f32> = access %8, 0u
-    store %gl_Position, %9
-    %10:f32 = swizzle %gl_Position, y
+    store %vert_position, %9
+    %10:f32 = swizzle %vert_position, y
     %11:f32 = negation %10
-    store_vector_element %gl_Position, 1u, %11
-    %12:f32 = swizzle %gl_Position, z
-    %13:f32 = swizzle %gl_Position, w
+    store_vector_element %vert_position, 1u, %11
+    %12:f32 = swizzle %vert_position, z
+    %13:f32 = swizzle %vert_position, w
     %14:f32 = mul 2.0f, %12
     %15:f32 = sub %14, %13
-    store_vector_element %gl_Position, 2u, %15
+    store_vector_element %vert_position, 2u, %15
     %16:vec4<f32> = access %8, 1u
     store %vert_loc0_Output, %16
-    store %gl_PointSize, 1.0f
+    store %vert___point_size, 1.0f
     ret
   }
 }
@@ -1050,9 +1050,9 @@
 }
 
 $B1: {  # root
-  %gl_SampleMaskIn:ptr<__in, array<i32, 1>, read> = var @builtin(sample_mask)
+  %foo_sample_mask:ptr<__in, array<i32, 1>, read> = var @builtin(sample_mask)
   %foo_loc0_Output:ptr<__out, f32, write> = var @location(0)
-  %gl_SampleMask:ptr<__out, array<i32, 1>, write> = var @builtin(sample_mask)
+  %foo_sample_mask_1:ptr<__out, array<i32, 1>, write> = var @builtin(sample_mask)  # %foo_sample_mask_1: 'foo_sample_mask'
 }
 
 %foo_inner = func(%mask_in:u32):Outputs {
@@ -1063,14 +1063,14 @@
 }
 %foo = @fragment func():void {
   $B3: {
-    %8:array<i32, 1> = load %gl_SampleMaskIn
+    %8:array<i32, 1> = load %foo_sample_mask
     %9:i32 = access %8, 0u
     %10:u32 = convert %9
     %11:Outputs = call %foo_inner, %10
     %12:f32 = access %11, 0u
     store %foo_loc0_Output, %12
     %13:u32 = access %11, 1u
-    %14:ptr<__out, i32, write> = access %gl_SampleMask, 0u
+    %14:ptr<__out, i32, write> = access %foo_sample_mask_1, 0u
     %15:i32 = convert %13
     store %14, %15
     ret
@@ -1180,8 +1180,8 @@
 $B1: {  # root
   %vert_loc1_Input:ptr<__in, f32, read> = var @location(1)
   %vert_loc1_Input_1:ptr<__in, i32, read> = var @location(1)  # %vert_loc1_Input_1: 'vert_loc1_Input'
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %vert_position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
+  %vert___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
   %frag1_loc1_Output:ptr<__out, f32, write> = var @location(1)
   %frag2_loc0_Output:ptr<__out, i32, write> = var @location(0)
 }
@@ -1209,16 +1209,16 @@
     %16:MyStruct = construct %15
     %17:i32 = load %vert_loc1_Input_1
     %18:vec4<f32> = call %vert_inner, %16, %17
-    store %gl_Position, %18
-    %19:f32 = swizzle %gl_Position, y
+    store %vert_position, %18
+    %19:f32 = swizzle %vert_position, y
     %20:f32 = negation %19
-    store_vector_element %gl_Position, 1u, %20
-    %21:f32 = swizzle %gl_Position, z
-    %22:f32 = swizzle %gl_Position, w
+    store_vector_element %vert_position, 1u, %20
+    %21:f32 = swizzle %vert_position, z
+    %22:f32 = swizzle %vert_position, w
     %23:f32 = mul 2.0f, %21
     %24:f32 = sub %23, %22
-    store_vector_element %gl_Position, 2u, %24
-    store %gl_PointSize, 1.0f
+    store_vector_element %vert_position, 2u, %24
+    store %vert___point_size, 1.0f
     ret
   }
 }
@@ -1311,7 +1311,7 @@
 $B1: {  # root
   %tint_push_constants:ptr<push_constant, tint_push_constant_struct, read> = var
   %foo_loc0_Output:ptr<__out, f32, write> = var @location(0)
-  %gl_FragDepth:ptr<__out, f32, write> = var @builtin(frag_depth)
+  %foo_frag_depth:ptr<__out, f32, write> = var @builtin(frag_depth)
 }
 
 %foo_inner = func():Outputs {
@@ -1331,7 +1331,7 @@
     %12:ptr<push_constant, f32, read> = access %tint_push_constants, 1u
     %13:f32 = load %12
     %14:f32 = clamp %9, %11, %13
-    store %gl_FragDepth, %14
+    store %foo_frag_depth, %14
     ret
   }
 }
@@ -1431,11 +1431,11 @@
 $B1: {  # root
   %tint_push_constants:ptr<push_constant, tint_push_constant_struct, read> = var
   %ep1_loc0_Output:ptr<__out, f32, write> = var @location(0)
-  %gl_FragDepth:ptr<__out, f32, write> = var @builtin(frag_depth)
+  %ep1_frag_depth:ptr<__out, f32, write> = var @builtin(frag_depth)
   %ep2_loc0_Output:ptr<__out, f32, write> = var @location(0)
-  %gl_FragDepth_1:ptr<__out, f32, write> = var @builtin(frag_depth)  # %gl_FragDepth_1: 'gl_FragDepth'
+  %ep2_frag_depth:ptr<__out, f32, write> = var @builtin(frag_depth)
   %ep3_loc0_Output:ptr<__out, f32, write> = var @location(0)
-  %gl_FragDepth_2:ptr<__out, f32, write> = var @builtin(frag_depth)  # %gl_FragDepth_2: 'gl_FragDepth'
+  %ep3_frag_depth:ptr<__out, f32, write> = var @builtin(frag_depth)
 }
 
 %ep1_inner = func():Outputs {
@@ -1467,7 +1467,7 @@
     %20:ptr<push_constant, f32, read> = access %tint_push_constants, 1u
     %21:f32 = load %20
     %22:f32 = clamp %17, %19, %21
-    store %gl_FragDepth, %22
+    store %ep1_frag_depth, %22
     ret
   }
 }
@@ -1482,7 +1482,7 @@
     %29:ptr<push_constant, f32, read> = access %tint_push_constants, 1u
     %30:f32 = load %29
     %31:f32 = clamp %26, %28, %30
-    store %gl_FragDepth_1, %31
+    store %ep2_frag_depth, %31
     ret
   }
 }
@@ -1497,7 +1497,7 @@
     %38:ptr<push_constant, f32, read> = access %tint_push_constants, 1u
     %39:f32 = load %38
     %40:f32 = clamp %35, %37, %39
-    store %gl_FragDepth_2, %40
+    store %ep3_frag_depth, %40
     ret
   }
 }
@@ -1543,8 +1543,8 @@
     auto* expect = R"(
 $B1: {  # root
   %vert_loc0_Input:ptr<__in, vec4<f32>, read> = var @location(0)
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %vert_position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
+  %vert___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
 }
 
 %vert_inner = func(%val:vec4<f32>):vec4<f32> {
@@ -1558,16 +1558,16 @@
     %8:vec4<f32> = load %vert_loc0_Input
     %9:vec4<f32> = swizzle %8, zyxw
     %10:vec4<f32> = call %vert_inner, %9
-    store %gl_Position, %10
-    %11:f32 = swizzle %gl_Position, y
+    store %vert_position, %10
+    %11:f32 = swizzle %vert_position, y
     %12:f32 = negation %11
-    store_vector_element %gl_Position, 1u, %12
-    %13:f32 = swizzle %gl_Position, z
-    %14:f32 = swizzle %gl_Position, w
+    store_vector_element %vert_position, 1u, %12
+    %13:f32 = swizzle %vert_position, z
+    %14:f32 = swizzle %vert_position, w
     %15:f32 = mul 2.0f, %13
     %16:f32 = sub %15, %14
-    store_vector_element %gl_Position, 2u, %16
-    store %gl_PointSize, 1.0f
+    store_vector_element %vert_position, 2u, %16
+    store %vert___point_size, 1.0f
     ret
   }
 }
@@ -1632,8 +1632,8 @@
   %vert_loc4_Input:ptr<__in, vec4<f32>, read> = var @location(4)
   %vert_loc3_Input:ptr<__in, vec4<f32>, read> = var @location(3)
   %vert_loc7_Input:ptr<__in, vec4<f32>, read> = var @location(7)
-  %gl_Position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
-  %gl_PointSize:ptr<__out, f32, write> = var @builtin(__point_size)
+  %vert_position:ptr<__out, vec4<f32>, write> = var @invariant @builtin(position)
+  %vert___point_size:ptr<__out, f32, write> = var @builtin(__point_size)
 }
 
 %vert_inner = func(%val1:f32, %val2:vec2<f32>, %sentinel:vec4<f32>, %val3:vec3<f32>, %val4:vec4<f32>):vec4<f32> {
@@ -1654,16 +1654,16 @@
     %23:vec4<f32> = load %vert_loc7_Input
     %24:vec4<f32> = swizzle %23, zyxw
     %25:vec4<f32> = call %vert_inner, %17, %19, %20, %22, %24
-    store %gl_Position, %25
-    %26:f32 = swizzle %gl_Position, y
+    store %vert_position, %25
+    %26:f32 = swizzle %vert_position, y
     %27:f32 = negation %26
-    store_vector_element %gl_Position, 1u, %27
-    %28:f32 = swizzle %gl_Position, z
-    %29:f32 = swizzle %gl_Position, w
+    store_vector_element %vert_position, 1u, %27
+    %28:f32 = swizzle %vert_position, z
+    %29:f32 = swizzle %vert_position, w
     %30:f32 = mul 2.0f, %28
     %31:f32 = sub %30, %29
-    store_vector_element %gl_Position, 2u, %31
-    store %gl_PointSize, 1.0f
+    store_vector_element %vert_position, 2u, %31
+    store %vert___point_size, 1.0f
     ret
   }
 }
diff --git a/src/tint/lang/glsl/writer/writer_test.cc b/src/tint/lang/glsl/writer/writer_test.cc
new file mode 100644
index 0000000..c41c97d
--- /dev/null
+++ b/src/tint/lang/glsl/writer/writer_test.cc
@@ -0,0 +1,127 @@
+// Copyright 2024 The Dawn & Tint Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "src/tint/lang/core/type/sampled_texture.h"
+#include "src/tint/lang/glsl/writer/helper_test.h"
+
+#include "gmock/gmock.h"
+
+namespace tint::glsl::writer {
+namespace {
+
+using namespace tint::core::fluent_types;     // NOLINT
+using namespace tint::core::number_suffixes;  // NOLINT
+
+TEST_F(GlslWriterTest, StripAllNames) {
+    auto* str =
+        ty.Struct(mod.symbols.New("MyStruct"), {
+                                                   {mod.symbols.Register("a"), ty.i32()},
+                                                   {mod.symbols.Register("b"), ty.vec4<i32>()},
+                                               });
+    auto* foo = b.Function("foo", ty.u32());
+    auto* param = b.FunctionParam("param", ty.u32());
+    foo->AppendParam(param);
+    b.Append(foo->Block(), [&] {  //
+        b.Return(foo, param);
+    });
+
+    auto* func = b.ComputeFunction("main");
+    auto* idx = b.FunctionParam("idx", ty.u32());
+    idx->SetBuiltin(core::BuiltinValue::kLocalInvocationIndex);
+    func->AppendParam(idx);
+    b.Append(func->Block(), [&] {  //
+        auto* var = b.Var("str", ty.ptr<function>(str));
+        auto* val = b.Load(var);
+        mod.SetName(val, "val");
+        auto* a = b.Access<i32>(val, 0_u);
+        mod.SetName(a, "a");
+        b.Let("let", b.Call<u32>(foo, idx));
+        b.Return(func);
+    });
+
+    Options options;
+    options.strip_all_names = true;
+    ASSERT_TRUE(Generate(options)) << err_ << output_.glsl;
+    EXPECT_EQ(output_.glsl, GlslHeader() + R"(
+
+struct tint_struct {
+  int member_0;
+  ivec4 member_1;
+};
+
+uint v(uint v_1) {
+  return v_1;
+}
+void v_2(uint v_3) {
+  tint_struct v_4 = tint_struct(0, ivec4(0));
+  uint v_5 = v(v_3);
+}
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  v_2(gl_LocalInvocationIndex);
+}
+)");
+}
+
+TEST_F(GlslWriterTest, StripAllNames_CombinedTextureSamplerName) {
+    BindingPoint texture_bp{1, 2};
+    BindingPoint sampler_bp{3, 4};
+    auto* tex_ty = ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k2d, ty.f32());
+    auto* texture = b.Var("texture", ty.ptr<handle>(tex_ty));
+    auto* sampler = b.Var("sampler", ty.ptr<handle>(ty.sampler()));
+    texture->SetBindingPoint(texture_bp.group, texture_bp.binding);
+    sampler->SetBindingPoint(sampler_bp.group, sampler_bp.binding);
+    mod.root_block->Append(texture);
+    mod.root_block->Append(sampler);
+
+    auto* func = b.Function("main", ty.void_(), core::ir::Function::PipelineStage::kFragment);
+    b.Append(func->Block(), [&] {  //
+        auto* t = b.Load(texture);
+        auto* s = b.Load(sampler);
+        b.Let("value",
+              b.Call<vec4<f32>>(core::BuiltinFn::kTextureSample, t, s, b.Zero<vec2<f32>>()));
+        b.Return(func);
+    });
+
+    Options options;
+    options.strip_all_names = true;
+    options.bindings.sampler_texture_to_name.insert(
+        {binding::CombinedTextureSamplerPair{texture_bp, sampler_bp},
+         "tint_combined_texture_sampler"});
+    ASSERT_TRUE(Generate(options)) << err_ << output_.glsl;
+    EXPECT_EQ(output_.glsl, GlslHeader() + R"(precision highp float;
+precision highp int;
+
+uniform highp sampler2D tint_combined_texture_sampler;
+void main() {
+  vec4 v = texture(tint_combined_texture_sampler, vec2(0.0f));
+}
+)");
+}
+
+}  // namespace
+}  // namespace tint::glsl::writer
diff --git a/test/tint/access/ptr.wgsl.expected.glsl b/test/tint/access/ptr.wgsl.expected.glsl
index 4c8ae27..ef133d7 100644
--- a/test/tint/access/ptr.wgsl.expected.glsl
+++ b/test/tint/access/ptr.wgsl.expected.glsl
@@ -39,7 +39,7 @@
 int call_builtin_with_mod_scope_ptr() {
   return atomicOr(g1, 0);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     atomicExchange(g1, 0);
   }
@@ -57,5 +57,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/array/assign_to_function_var.wgsl.expected.glsl b/test/tint/array/assign_to_function_var.wgsl.expected.glsl
index 5f56299..2b77dc7 100644
--- a/test/tint/array/assign_to_function_var.wgsl.expected.glsl
+++ b/test/tint/array/assign_to_function_var.wgsl.expected.glsl
@@ -39,7 +39,7 @@
   int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
   dst_nested = src_nested;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_2 = 0u;
     v_2 = tint_local_index;
@@ -61,5 +61,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/array/assign_to_private_var.wgsl.expected.glsl b/test/tint/array/assign_to_private_var.wgsl.expected.glsl
index a95fd31..6f1d978 100644
--- a/test/tint/array/assign_to_private_var.wgsl.expected.glsl
+++ b/test/tint/array/assign_to_private_var.wgsl.expected.glsl
@@ -39,7 +39,7 @@
   int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
   dst_nested = src_nested;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_2 = 0u;
     v_2 = tint_local_index;
@@ -61,5 +61,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/array/assign_to_storage_var.wgsl.expected.glsl b/test/tint/array/assign_to_storage_var.wgsl.expected.glsl
index 9e21feb..837e2f9 100644
--- a/test/tint/array/assign_to_storage_var.wgsl.expected.glsl
+++ b/test/tint/array/assign_to_storage_var.wgsl.expected.glsl
@@ -49,7 +49,7 @@
   int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
   v_3.inner.arr = src_nested;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_4 = 0u;
     v_4 = tint_local_index;
@@ -71,5 +71,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/array/assign_to_workgroup_var.wgsl.expected.glsl b/test/tint/array/assign_to_workgroup_var.wgsl.expected.glsl
index 2c2b7b6..ece8bf3 100644
--- a/test/tint/array/assign_to_workgroup_var.wgsl.expected.glsl
+++ b/test/tint/array/assign_to_workgroup_var.wgsl.expected.glsl
@@ -39,7 +39,7 @@
   int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
   dst_nested = src_nested;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_2 = 0u;
     v_2 = tint_local_index;
@@ -77,5 +77,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/storage/dynamic_index/read.wgsl.expected.glsl b/test/tint/buffer/storage/dynamic_index/read.wgsl.expected.glsl
index eda6b70..cdef163 100644
--- a/test/tint/buffer/storage/dynamic_index/read.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/dynamic_index/read.wgsl.expected.glsl
@@ -45,7 +45,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   uint v_1 = min(idx, (uint(sb.arr.length()) - 1u));
   float scalar_f32 = sb.arr[v_1].scalar_f32;
   uint v_2 = min(idx, (uint(sb.arr.length()) - 1u));
@@ -111,5 +111,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/storage/dynamic_index/read_f16.wgsl.expected.glsl b/test/tint/buffer/storage/dynamic_index/read_f16.wgsl.expected.glsl
index 80a3e12..0ffe86e 100644
--- a/test/tint/buffer/storage/dynamic_index/read_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/dynamic_index/read_f16.wgsl.expected.glsl
@@ -68,7 +68,7 @@
 int tint_f16_to_i32(float16_t value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -65504.0hf)), (value <= 65504.0hf));
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   uint v_1 = min(idx, (uint(sb.arr.length()) - 1u));
   float scalar_f32 = sb.arr[v_1].scalar_f32;
   uint v_2 = min(idx, (uint(sb.arr.length()) - 1u));
@@ -176,5 +176,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.glsl b/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.glsl
index 3689b83..f057e9e 100644
--- a/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/dynamic_index/write.wgsl.expected.glsl
@@ -70,7 +70,7 @@
   sb.arr[target_indices[0u]].mat2x3_f32[0u] = value_param[0u];
   sb.arr[target_indices[0u]].mat2x3_f32[1u] = value_param[1u];
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   uint v_2 = min(idx, (uint(sb.arr.length()) - 1u));
   sb.arr[v_2].scalar_f32 = 0.0f;
   uint v_3 = min(idx, (uint(sb.arr.length()) - 1u));
@@ -114,5 +114,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.glsl b/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.glsl
index d36c070..cfdc9c5 100644
--- a/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/dynamic_index/write_f16.wgsl.expected.glsl
@@ -105,7 +105,7 @@
   sb.arr[target_indices[0u]].mat2x3_f32[0u] = value_param[0u];
   sb.arr[target_indices[0u]].mat2x3_f32[1u] = value_param[1u];
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   uint v_2 = min(idx, (uint(sb.arr.length()) - 1u));
   sb.arr[v_2].scalar_f32 = 0.0f;
   uint v_3 = min(idx, (uint(sb.arr.length()) - 1u));
@@ -174,5 +174,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/storage/types/array4_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/array4_f16.wgsl.expected.glsl
index 513176f..ec9bd73 100644
--- a/test/tint/buffer/storage/types/array4_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/array4_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float16_t inner[4];
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float16_t inner[4];
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/array4_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/array4_f32.wgsl.expected.glsl
index d3190f5..a3d2288 100644
--- a/test/tint/buffer/storage/types/array4_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/array4_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float inner[4];
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float inner[4];
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/f16.wgsl.expected.glsl
index 87fe651..18c5733 100644
--- a/test/tint/buffer/storage/types/f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float16_t inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float16_t inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/f32.wgsl.expected.glsl
index 7efec97..1506132 100644
--- a/test/tint/buffer/storage/types/f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/i32.wgsl.expected.glsl b/test/tint/buffer/storage/types/i32.wgsl.expected.glsl
index 1d7cfb4..df15761 100644
--- a/test/tint/buffer/storage/types/i32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/i32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   int inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   int inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat2x2_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x2_f16.wgsl.expected.glsl
index 87d35e7..229fdaf 100644
--- a/test/tint/buffer/storage/types/mat2x2_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x2_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat2x2_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x2_f32.wgsl.expected.glsl
index 8c32218..09fda05 100644
--- a/test/tint/buffer/storage/types/mat2x2_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x2_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat2x3_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x3_f16.wgsl.expected.glsl
index 6fe5295..73c2102 100644
--- a/test/tint/buffer/storage/types/mat2x3_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x3_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v_1;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat2x3_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x3_f32.wgsl.expected.glsl
index 5716b68..4db1577 100644
--- a/test/tint/buffer/storage/types/mat2x3_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x3_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat2x3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v_1;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat2x4_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x4_f16.wgsl.expected.glsl
index 525bff8..2eaf4cf 100644
--- a/test/tint/buffer/storage/types/mat2x4_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x4_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat2x4_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat2x4_f32.wgsl.expected.glsl
index 52fa6ba..0ea4155 100644
--- a/test/tint/buffer/storage/types/mat2x4_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat2x4_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat3x2_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x2_f16.wgsl.expected.glsl
index 19fbf4f..bfd7fe1 100644
--- a/test/tint/buffer/storage/types/mat3x2_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x2_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat3x2_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x2_f32.wgsl.expected.glsl
index 8257354..4a6c061 100644
--- a/test/tint/buffer/storage/types/mat3x2_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x2_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat3x3_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x3_f16.wgsl.expected.glsl
index c2edbec..dde1c13 100644
--- a/test/tint/buffer/storage/types/mat3x3_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x3_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v_1;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat3x3_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x3_f32.wgsl.expected.glsl
index 84dec3f..5b0a28a 100644
--- a/test/tint/buffer/storage/types/mat3x3_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x3_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v_1;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat3x4_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x4_f16.wgsl.expected.glsl
index d4348a6..59f1781 100644
--- a/test/tint/buffer/storage/types/mat3x4_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x4_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat3x4_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat3x4_f32.wgsl.expected.glsl
index 2470621..3cab0f6 100644
--- a/test/tint/buffer/storage/types/mat3x4_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat3x4_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat4x2_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x2_f16.wgsl.expected.glsl
index 725d1bd..976879f 100644
--- a/test/tint/buffer/storage/types/mat4x2_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x2_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat4x2_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x2_f32.wgsl.expected.glsl
index ce0535c..c291b0c 100644
--- a/test/tint/buffer/storage/types/mat4x2_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x2_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat4x3_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x3_f16.wgsl.expected.glsl
index 0ee4dfc..24a6a58 100644
--- a/test/tint/buffer/storage/types/mat4x3_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x3_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v_1;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat4x3_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x3_f32.wgsl.expected.glsl
index 4e379b0..32ed4ac 100644
--- a/test/tint/buffer/storage/types/mat4x3_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x3_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat4x3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v_1;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/buffer/storage/types/mat4x4_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x4_f16.wgsl.expected.glsl
index a9bd4c0..a8418e4 100644
--- a/test/tint/buffer/storage/types/mat4x4_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x4_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/mat4x4_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/mat4x4_f32.wgsl.expected.glsl
index 2e7581a..451e246 100644
--- a/test/tint/buffer/storage/types/mat4x4_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/mat4x4_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   mat4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/runtime_array_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/runtime_array_f16.wgsl.expected.glsl
index 6c8b941..1cf9177 100644
--- a/test/tint/buffer/storage/types/runtime_array_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/runtime_array_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float16_t inner[];
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float16_t inner[];
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/runtime_array_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/runtime_array_f32.wgsl.expected.glsl
index 38405fc..efeb2a4 100644
--- a/test/tint/buffer/storage/types/runtime_array_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/runtime_array_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   float inner[];
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   float inner[];
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/struct_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/struct_f16.wgsl.expected.glsl
index e00dbeb..4f4eab9 100644
--- a/test/tint/buffer/storage/types/struct_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/struct_f16.wgsl.expected.glsl
@@ -14,11 +14,11 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   S inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   S inner;
 } v_1;
 void tint_store_and_preserve_padding_1(Inner value_param) {
diff --git a/test/tint/buffer/storage/types/struct_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/struct_f32.wgsl.expected.glsl
index d7874a3..d346c44 100644
--- a/test/tint/buffer/storage/types/struct_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/struct_f32.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   S inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   S inner;
 } v_1;
 void tint_store_and_preserve_padding_1(Inner value_param) {
diff --git a/test/tint/buffer/storage/types/u32.wgsl.expected.glsl b/test/tint/buffer/storage/types/u32.wgsl.expected.glsl
index 2784452..59d52c5 100644
--- a/test/tint/buffer/storage/types/u32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/u32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   uint inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   uint inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec2_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec2_f16.wgsl.expected.glsl
index f835edb..b23a9d9 100644
--- a/test/tint/buffer/storage/types/vec2_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec2_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16vec2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16vec2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec2_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec2_f32.wgsl.expected.glsl
index d311fdc..3fe6286 100644
--- a/test/tint/buffer/storage/types/vec2_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec2_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   vec2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   vec2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec2_i32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec2_i32.wgsl.expected.glsl
index 01bfcf5..d240dd5 100644
--- a/test/tint/buffer/storage/types/vec2_i32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec2_i32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   ivec2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   ivec2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec2_u32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec2_u32.wgsl.expected.glsl
index 4caf86d..104cb05 100644
--- a/test/tint/buffer/storage/types/vec2_u32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec2_u32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   uvec2 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   uvec2 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec3_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec3_f16.wgsl.expected.glsl
index e16c4c6..2086b88 100644
--- a/test/tint/buffer/storage/types/vec3_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec3_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16vec3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16vec3 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec3_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec3_f32.wgsl.expected.glsl
index b913344..ae848ff 100644
--- a/test/tint/buffer/storage/types/vec3_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec3_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   vec3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   vec3 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec3_i32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec3_i32.wgsl.expected.glsl
index d9a17cc..7d03720 100644
--- a/test/tint/buffer/storage/types/vec3_i32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec3_i32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   ivec3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   ivec3 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec3_u32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec3_u32.wgsl.expected.glsl
index 8a4c781..a2cd872 100644
--- a/test/tint/buffer/storage/types/vec3_u32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec3_u32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   uvec3 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   uvec3 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec4_f16.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec4_f16.wgsl.expected.glsl
index b0c9943..63eea6c 100644
--- a/test/tint/buffer/storage/types/vec4_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec4_f16.wgsl.expected.glsl
@@ -2,11 +2,11 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   f16vec4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16vec4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec4_f32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec4_f32.wgsl.expected.glsl
index 501c79d..2daca4f 100644
--- a/test/tint/buffer/storage/types/vec4_f32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec4_f32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   vec4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   vec4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec4_i32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec4_i32.wgsl.expected.glsl
index ed797db..9bcaff5 100644
--- a/test/tint/buffer/storage/types/vec4_i32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec4_i32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   ivec4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   ivec4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/storage/types/vec4_u32.wgsl.expected.glsl b/test/tint/buffer/storage/types/vec4_u32.wgsl.expected.glsl
index 4cde26f..01ef804 100644
--- a/test/tint/buffer/storage/types/vec4_u32.wgsl.expected.glsl
+++ b/test/tint/buffer/storage/types/vec4_u32.wgsl.expected.glsl
@@ -1,11 +1,11 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   uvec4 inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   uvec4 inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.glsl b/test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.glsl
index 5c07b28..e6e4d86 100644
--- a/test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.glsl
+++ b/test/tint/buffer/uniform/dynamic_index/read.wgsl.expected.glsl
@@ -70,7 +70,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   float scalar_f32 = v.inner.arr[min(idx, 7u)].scalar_f32;
   int scalar_i32 = v.inner.arr[min(idx, 7u)].scalar_i32;
   uint scalar_u32 = v.inner.arr[min(idx, 7u)].scalar_u32;
@@ -114,5 +114,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.glsl b/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.glsl
index 38ab55f..de06bab 100644
--- a/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.glsl
+++ b/test/tint/buffer/uniform/dynamic_index/read_f16.wgsl.expected.glsl
@@ -118,7 +118,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   float scalar_f32 = v.inner.arr[min(idx, 7u)].scalar_f32;
   int scalar_i32 = v.inner.arr[min(idx, 7u)].scalar_i32;
   uint scalar_u32 = v.inner.arr[min(idx, 7u)].scalar_u32;
@@ -207,5 +207,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/chromium/1236161.wgsl.expected.glsl b/test/tint/bug/chromium/1236161.wgsl.expected.glsl
index 48824a9..d519cef 100644
--- a/test/tint/bug/chromium/1236161.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1236161.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
-void tint_symbol() {
-  float tint_symbol_1 = 1.0f;
+void v() {
+  float v_1 = 1.0f;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/bug/chromium/1251009.wgsl.expected.glsl b/test/tint/bug/chromium/1251009.wgsl.expected.glsl
index 628fb67..055abc6 100644
--- a/test/tint/bug/chromium/1251009.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1251009.wgsl.expected.glsl
@@ -16,21 +16,21 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in uint tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in uint main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+vec4 main_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) {
   uint foo = (inputs0.vertex_index + instance_index);
   return vec4(0.0f);
 }
 void main() {
   uint v = uint(gl_VertexID);
-  VertexInputs0 v_1 = VertexInputs0(v, tint_symbol_loc0_Input);
-  uint v_2 = tint_symbol_loc1_Input;
+  VertexInputs0 v_1 = VertexInputs0(v, main_loc0_Input);
+  uint v_2 = main_loc1_Input;
   uint v_3 = uint(gl_InstanceID);
   uint v_4 = (v_3 + tint_push_constants.tint_first_instance);
-  gl_Position = tint_symbol_inner(v_1, v_2, v_4, VertexInputs1(tint_symbol_loc2_Input, tint_symbol_loc3_Input));
+  gl_Position = main_inner(v_1, v_2, v_4, VertexInputs1(main_loc2_Input, main_loc3_Input));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/chromium/1381883.wgsl.expected.glsl b/test/tint/bug/chromium/1381883.wgsl.expected.glsl
index 1b3b1e0..4bfe0b1 100644
--- a/test/tint/bug/chromium/1381883.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1381883.wgsl.expected.glsl
@@ -3,8 +3,8 @@
 precision highp int;
 
 layout(location = 2) in float tint_interstage_location2;
-void tint_symbol_inner(float none) {
+void main_inner(float none) {
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location2);
+  main_inner(tint_interstage_location2);
 }
diff --git a/test/tint/bug/chromium/1417515.wgsl.expected.glsl b/test/tint/bug/chromium/1417515.wgsl.expected.glsl
index 44af1af..8193a88 100644
--- a/test/tint/bug/chromium/1417515.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1417515.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
diff --git a/test/tint/bug/chromium/1430309.wgsl.expected.glsl b/test/tint/bug/chromium/1430309.wgsl.expected.glsl
index 2e29035..a942408 100644
--- a/test/tint/bug/chromium/1430309.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1430309.wgsl.expected.glsl
@@ -8,16 +8,16 @@
 };
 
 struct frexp_result_f32_1 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 frexp_result_f32 a = frexp_result_f32(0.0f);
 frexp_result_f32_1 b = frexp_result_f32_1(0.5f, 1);
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
-  return vec4(a.f, b.fract, 0.0f, 0.0f);
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
+  return vec4(a.f, b.member_0, 0.0f, 0.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/bug/chromium/1434271.wgsl.expected.glsl b/test/tint/bug/chromium/1434271.wgsl.expected.glsl
index 32addf4..78ce090 100644
--- a/test/tint/bug/chromium/1434271.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1434271.wgsl.expected.glsl
@@ -82,23 +82,23 @@
 layout(location = 2) in vec2 vs_main_loc2_Input;
 layout(location = 0) out vec4 tint_interstage_location0;
 layout(location = 1) out vec2 tint_interstage_location1;
-VertexOutput vs_main_inner(VertexInput tint_symbol) {
-  vec3 quad_pos = (mat2x3(v.inner.right, v.inner.up) * tint_symbol.quad_pos);
-  vec3 position = (tint_symbol.position - (quad_pos + 0.00999999977648258209f));
-  VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f), vec4(0.0f), vec2(0.0f));
-  mat4 v_1 = v.inner.modelViewProjectionMatrix;
-  tint_symbol_1.position = (v_1 * vec4(position, 1.0f));
-  tint_symbol_1.color = tint_symbol.color;
-  tint_symbol_1.quad_pos = tint_symbol.quad_pos;
-  return tint_symbol_1;
+VertexOutput vs_main_inner(VertexInput v_1) {
+  vec3 quad_pos = (mat2x3(v.inner.right, v.inner.up) * v_1.quad_pos);
+  vec3 position = (v_1.position - (quad_pos + 0.00999999977648258209f));
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f), vec2(0.0f));
+  mat4 v_3 = v.inner.modelViewProjectionMatrix;
+  v_2.position = (v_3 * vec4(position, 1.0f));
+  v_2.color = v_1.color;
+  v_2.quad_pos = v_1.quad_pos;
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vs_main_inner(VertexInput(vs_main_loc0_Input, vs_main_loc1_Input, vs_main_loc2_Input));
-  gl_Position = v_2.position;
+  VertexOutput v_4 = vs_main_inner(VertexInput(vs_main_loc0_Input, vs_main_loc1_Input, vs_main_loc2_Input));
+  gl_Position = v_4.position;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.color;
-  tint_interstage_location1 = v_2.quad_pos;
+  tint_interstage_location0 = v_4.color;
+  tint_interstage_location1 = v_4.quad_pos;
   gl_PointSize = 1.0f;
 }
 //
diff --git a/test/tint/bug/chromium/344265982.wgsl.expected.glsl b/test/tint/bug/chromium/344265982.wgsl.expected.glsl
index 5c01b87..c37f44f 100644
--- a/test/tint/bug/chromium/344265982.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/344265982.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 precision highp int;
 
 layout(binding = 0, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_buffer_block_ssbo {
   int inner[4];
 } v;
 void foo() {
diff --git a/test/tint/bug/chromium/40943165.wgsl.expected.glsl b/test/tint/bug/chromium/40943165.wgsl.expected.glsl
index 7d6121b..83fa0a1 100644
--- a/test/tint/bug/chromium/40943165.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/40943165.wgsl.expected.glsl
@@ -1,8 +1,8 @@
 #version 310 es
 
 shared mat2 W;
-void F_inner(uint tint_symbol) {
-  if ((tint_symbol < 1u)) {
+void F_inner(uint mat2x2_1) {
+  if ((mat2x2_1 < 1u)) {
     W = mat2(vec2(0.0f), vec2(0.0f));
   }
   barrier();
diff --git a/test/tint/bug/dawn/947.wgsl.expected.glsl b/test/tint/bug/dawn/947.wgsl.expected.glsl
index b3da8a8..ce23e78 100644
--- a/test/tint/bug/dawn/947.wgsl.expected.glsl
+++ b/test/tint/bug/dawn/947.wgsl.expected.glsl
@@ -21,20 +21,20 @@
 layout(location = 0) out vec2 tint_interstage_location0;
 VertexOutputs vs_main_inner(uint VertexIndex) {
   vec2 texcoord[3] = vec2[3](vec2(-0.5f, 0.0f), vec2(1.5f, 0.0f), vec2(0.5f, 2.0f));
-  VertexOutputs tint_symbol = VertexOutputs(vec2(0.0f), vec4(0.0f));
-  tint_symbol.position = vec4(((texcoord[min(VertexIndex, 2u)] * 2.0f) - vec2(1.0f)), 0.0f, 1.0f);
+  VertexOutputs v_1 = VertexOutputs(vec2(0.0f), vec4(0.0f));
+  v_1.position = vec4(((texcoord[min(VertexIndex, 2u)] * 2.0f) - vec2(1.0f)), 0.0f, 1.0f);
   bool flipY = (v.inner.u_scale.y < 0.0f);
   if (flipY) {
-    tint_symbol.texcoords = ((((texcoord[min(VertexIndex, 2u)] * v.inner.u_scale) + v.inner.u_offset) * vec2(1.0f, -1.0f)) + vec2(0.0f, 1.0f));
+    v_1.texcoords = ((((texcoord[min(VertexIndex, 2u)] * v.inner.u_scale) + v.inner.u_offset) * vec2(1.0f, -1.0f)) + vec2(0.0f, 1.0f));
   } else {
-    tint_symbol.texcoords = ((((texcoord[min(VertexIndex, 2u)] * vec2(1.0f, -1.0f)) + vec2(0.0f, 1.0f)) * v.inner.u_scale) + v.inner.u_offset);
+    v_1.texcoords = ((((texcoord[min(VertexIndex, 2u)] * vec2(1.0f, -1.0f)) + vec2(0.0f, 1.0f)) * v.inner.u_scale) + v.inner.u_offset);
   }
-  return tint_symbol;
+  return v_1;
 }
 void main() {
-  VertexOutputs v_1 = vs_main_inner(uint(gl_VertexID));
-  tint_interstage_location0 = v_1.texcoords;
-  gl_Position = v_1.position;
+  VertexOutputs v_2 = vs_main_inner(uint(gl_VertexID));
+  tint_interstage_location0 = v_2.texcoords;
+  gl_Position = v_2.position;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl
index cf6c592..0063d58 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -25,5 +25,5 @@
 void main() {
   S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
   uint v_2 = min(uint(v.inner.dynamic_idx), 63u);
-  v_1.inner.tint_symbol = s.data[v_2];
+  v_1.inner.member_0 = s.data[v_2];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl
index 2ed6884..5c1ffe0 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -25,5 +25,5 @@
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   uint v_2 = min(uint(v.inner.dynamic_idx), 63u);
-  v_1.inner.tint_symbol = s.data[v_2];
+  v_1.inner.member_0 = s.data[v_2];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl
index 1518545..8560ba6 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct SSBO {
@@ -28,5 +28,5 @@
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   uint v_3 = min(uint(v.inner.dynamic_idx), 3u);
-  v_1.inner.tint_symbol = v_2.inner.data[v_3];
+  v_1.inner.member_0 = v_2.inner.data[v_3];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl
index e6a7047..1f3c5a3 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl
@@ -10,7 +10,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 layout(binding = 0, std140)
@@ -24,5 +24,5 @@
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   uint v_2 = min(uint(v.inner.dynamic_idx), 3u);
-  v_1.inner.tint_symbol = v.inner.data[v_2].x;
+  v_1.inner.member_0 = v.inner.data[v_2].x;
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl
index 1be01ae..e0ff623 100644
--- a/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -40,7 +40,7 @@
   }
   barrier();
   uint v_4 = min(uint(v.inner.dynamic_idx), 63u);
-  v_1.inner.tint_symbol = s.data[v_4];
+  v_1.inner.member_0 = s.data[v_4];
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl
index a3e95ca..a467454 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -26,5 +26,5 @@
   S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
   uint v_2 = min(uint(v.inner.dynamic_idx), 63u);
   s.data[v_2] = 1;
-  v_1.inner.tint_symbol = s.data[3u];
+  v_1.inner.member_0 = s.data[3u];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl
index ae705f7..5bb4ef2 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -29,5 +29,5 @@
 void main() {
   S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
   x(s);
-  v_1.inner.tint_symbol = s.data[3u];
+  v_1.inner.member_0 = s.data[3u];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl
index 5dbc127..2673302 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -26,5 +26,5 @@
 void main() {
   uint v_2 = min(uint(v.inner.dynamic_idx), 63u);
   s.data[v_2] = 1;
-  v_1.inner.tint_symbol = s.data[3u];
+  v_1.inner.member_0 = s.data[3u];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl
index b29b216..f3315d8 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -29,5 +29,5 @@
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   x(s);
-  v_1.inner.tint_symbol = s.data[3u];
+  v_1.inner.member_0 = s.data[3u];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl
index 948ac89..ad39d30 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct SSBO {
@@ -29,5 +29,5 @@
 void main() {
   uint v_3 = min(uint(v.inner.dynamic_idx), 3u);
   v_2.inner.data[v_3] = 1;
-  v_1.inner.tint_symbol = v_2.inner.data[3u];
+  v_1.inner.member_0 = v_2.inner.data[3u];
 }
diff --git a/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl b/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl
index 9d7ac65..a105cfd 100644
--- a/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 struct Result {
-  int tint_symbol;
+  int member_0;
 };
 
 struct S {
@@ -41,7 +41,7 @@
   barrier();
   uint v_4 = min(uint(v.inner.dynamic_idx), 63u);
   s.data[v_4] = 1;
-  v_1.inner.tint_symbol = s.data[3u];
+  v_1.inner.member_0 = s.data[3u];
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl b/test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
index d020ead..3520514 100644
--- a/test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
+++ b/test/tint/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl
@@ -4,8 +4,8 @@
 
 uniform highp sampler2D randomTexture_Sampler;
 layout(location = 0) in vec2 tint_interstage_location0;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner(vec2 vUV) {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner(vec2 vUV) {
   vec3 random = texture(randomTexture_Sampler, vUV).xyz;
   int i = 0;
   {
@@ -61,5 +61,5 @@
   return vec4(1.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(tint_interstage_location0);
+  main_loc0_Output = main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/bug/tint/1046.wgsl.expected.glsl b/test/tint/bug/tint/1046.wgsl.expected.glsl
index 46ecb1b..3933698 100644
--- a/test/tint/bug/tint/1046.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1046.wgsl.expected.glsl
@@ -42,12 +42,12 @@
 layout(location = 1) in vec4 tint_interstage_location1;
 layout(location = 2) in vec2 tint_interstage_location2;
 layout(location = 3) in vec4 tint_interstage_location3;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-FragmentOutput tint_symbol_inner(FragmentInput fragment) {
-  FragmentOutput tint_symbol_1 = FragmentOutput(vec4(0.0f));
-  tint_symbol_1.color = vec4(1.0f, 0.0f, 0.0f, 1.0f);
-  return tint_symbol_1;
+layout(location = 0) out vec4 main_loc0_Output;
+FragmentOutput main_inner(FragmentInput fragment) {
+  FragmentOutput v_1 = FragmentOutput(vec4(0.0f));
+  v_1.color = vec4(1.0f, 0.0f, 0.0f, 1.0f);
+  return v_1;
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(FragmentInput(gl_FragCoord, tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3)).color;
+  main_loc0_Output = main_inner(FragmentInput(gl_FragCoord, tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3)).color;
 }
diff --git a/test/tint/bug/tint/1061.spvasm.expected.glsl b/test/tint/bug/tint/1061.spvasm.expected.glsl
index e1b6cb0..1e3f72d 100644
--- a/test/tint/bug/tint/1061.spvasm.expected.glsl
+++ b/test/tint/bug/tint/1061.spvasm.expected.glsl
@@ -16,7 +16,7 @@
   buf0 inner;
 } v_1;
 vec4 x_GLF_color = vec4(0.0f);
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 void main_1() {
   float f = 0.0f;
   vec4 v = vec4(0.0f);
@@ -28,10 +28,10 @@
     x_GLF_color = vec4(0.0f);
   }
 }
-main_out tint_symbol_inner() {
+main_out main_inner() {
   main_1();
   return main_out(x_GLF_color);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner().x_GLF_color_1;
+  main_loc0_Output = main_inner().x_GLF_color_1;
 }
diff --git a/test/tint/bug/tint/1076.wgsl.expected.glsl b/test/tint/bug/tint/1076.wgsl.expected.glsl
index adbb13a..82f7a7b 100644
--- a/test/tint/bug/tint/1076.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1076.wgsl.expected.glsl
@@ -11,17 +11,17 @@
 
 layout(location = 0) in float tint_interstage_location0;
 layout(location = 1) in float tint_interstage_location1;
-layout(location = 0) out float tint_symbol_loc0_Output;
-FragIn tint_symbol_inner(FragIn tint_symbol_1, float b) {
-  if ((tint_symbol_1.mask == 0u)) {
-    return tint_symbol_1;
+layout(location = 0) out float main_loc0_Output;
+FragIn main_inner(FragIn v, float b) {
+  if ((v.mask == 0u)) {
+    return v;
   }
   return FragIn(b, 1u);
 }
 void main() {
-  float v = tint_interstage_location0;
-  FragIn v_1 = FragIn(v, uint(gl_SampleMaskIn[0u]));
-  FragIn v_2 = tint_symbol_inner(v_1, tint_interstage_location1);
-  tint_symbol_loc0_Output = v_2.a;
-  gl_SampleMask[0u] = int(v_2.mask);
+  float v_1 = tint_interstage_location0;
+  FragIn v_2 = FragIn(v_1, uint(gl_SampleMaskIn[0u]));
+  FragIn v_3 = main_inner(v_2, tint_interstage_location1);
+  main_loc0_Output = v_3.a;
+  gl_SampleMask[0u] = int(v_3.mask);
 }
diff --git a/test/tint/bug/tint/1081.wgsl.expected.glsl b/test/tint/bug/tint/1081.wgsl.expected.glsl
index 47aaeb2..2eb734e 100644
--- a/test/tint/bug/tint/1081.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1081.wgsl.expected.glsl
@@ -4,14 +4,14 @@
 
 bool continue_execution = true;
 layout(location = 1) flat in ivec3 tint_interstage_location1;
-layout(location = 2) out int tint_symbol_loc2_Output;
+layout(location = 2) out int main_loc2_Output;
 int f(int x) {
   if ((x == 10)) {
     continue_execution = false;
   }
   return x;
 }
-int tint_symbol_inner(ivec3 x) {
+int main_inner(ivec3 x) {
   int y = x.x;
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -38,5 +38,5 @@
   return y;
 }
 void main() {
-  tint_symbol_loc2_Output = tint_symbol_inner(tint_interstage_location1);
+  main_loc2_Output = main_inner(tint_interstage_location1);
 }
diff --git a/test/tint/bug/tint/1088.spvasm.expected.glsl b/test/tint/bug/tint/1088.spvasm.expected.glsl
index 128850f..5f1218b 100644
--- a/test/tint/bug/tint/1088.spvasm.expected.glsl
+++ b/test/tint/bug/tint/1088.spvasm.expected.glsl
@@ -19,7 +19,7 @@
 };
 
 struct main_out {
-  vec4 tint_symbol;
+  vec4 member_0;
   vec2 vUV_1;
 };
 
@@ -31,10 +31,10 @@
 vec2 vUV = vec2(0.0f);
 vec2 uv = vec2(0.0f);
 vec3 normal = vec3(0.0f);
-vec4 tint_symbol = vec4(0.0f);
-layout(location = 0) in vec3 tint_symbol_1_loc0_Input;
-layout(location = 2) in vec2 tint_symbol_1_loc2_Input;
-layout(location = 1) in vec3 tint_symbol_1_loc1_Input;
+vec4 v_1 = vec4(0.0f);
+layout(location = 0) in vec3 main_loc0_Input;
+layout(location = 2) in vec2 main_loc2_Input;
+layout(location = 1) in vec3 main_loc1_Input;
 layout(location = 0) out vec2 tint_interstage_location0;
 void main_1() {
   vec4 q = vec4(0.0f);
@@ -43,23 +43,23 @@
   p = q.xyz;
   p.x = (p.x + sin(((v.inner.test[0u].el * position_1.y) + v.inner.time)));
   p.y = (p.y + sin((v.inner.time + 4.0f)));
-  mat4 v_1 = v.inner.worldViewProjection;
-  tint_symbol = (v_1 * vec4(p.x, p.y, p.z, 1.0f));
+  mat4 v_2 = v.inner.worldViewProjection;
+  v_1 = (v_2 * vec4(p.x, p.y, p.z, 1.0f));
   vUV = uv;
-  tint_symbol.y = (tint_symbol.y * -1.0f);
+  v_1.y = (v_1.y * -1.0f);
 }
-main_out tint_symbol_1_inner(vec3 position_1_param, vec2 uv_param, vec3 normal_param) {
+main_out main_inner(vec3 position_1_param, vec2 uv_param, vec3 normal_param) {
   position_1 = position_1_param;
   uv = uv_param;
   normal = normal_param;
   main_1();
-  return main_out(tint_symbol, vUV);
+  return main_out(v_1, vUV);
 }
 void main() {
-  main_out v_2 = tint_symbol_1_inner(tint_symbol_1_loc0_Input, tint_symbol_1_loc2_Input, tint_symbol_1_loc1_Input);
-  gl_Position = v_2.tint_symbol;
+  main_out v_3 = main_inner(main_loc0_Input, main_loc2_Input, main_loc1_Input);
+  gl_Position = v_3.member_0;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.vUV_1;
+  tint_interstage_location0 = v_3.vUV_1;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/bug/tint/1118.wgsl.expected.glsl b/test/tint/bug/tint/1118.wgsl.expected.glsl
index bb13c3f..beb534b 100644
--- a/test/tint/bug/tint/1118.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1118.wgsl.expected.glsl
@@ -41,7 +41,7 @@
 bool continue_execution = true;
 layout(location = 2) in float tint_interstage_location2;
 layout(location = 3) in float tint_interstage_location3;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 void main_1() {
   vec3 viewDirectionW = vec3(0.0f);
   vec4 baseColor = vec4(0.0f);
@@ -118,7 +118,7 @@
   vec4 x_147 = color;
   glFragColor = x_147;
 }
-main_out tint_symbol_inner(float fClipDistance3_param, float fClipDistance4_param) {
+main_out main_inner(float fClipDistance3_param, float fClipDistance4_param) {
   fClipDistance3 = fClipDistance3_param;
   fClipDistance4 = fClipDistance4_param;
   main_1();
@@ -129,5 +129,5 @@
   return v_5;
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(tint_interstage_location2, tint_interstage_location3).glFragColor_1;
+  main_loc0_Output = main_inner(tint_interstage_location2, tint_interstage_location3).glFragColor_1;
 }
diff --git a/test/tint/bug/tint/1121.wgsl.expected.glsl b/test/tint/bug/tint/1121.wgsl.expected.glsl
index ff44631..b269b0b 100644
--- a/test/tint/bug/tint/1121.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1121.wgsl.expected.glsl
@@ -26,8 +26,8 @@
 };
 
 struct Uniforms {
-  vec4 tint_symbol;
-  vec4 tint_symbol_1;
+  vec4 member_0;
+  vec4 member_1;
   mat4 viewMatrix;
   mat4 projectionMatrix;
   vec4 fullScreenSize;
@@ -49,7 +49,7 @@
 uniform uniforms_block_1_ubo {
   Uniforms inner;
 } v_2;
-void tint_symbol_2_inner(uvec3 GlobalInvocationID) {
+void main_inner(uvec3 GlobalInvocationID) {
   uint index = GlobalInvocationID.x;
   if ((index >= v_1.inner.numLights)) {
     return;
@@ -63,10 +63,10 @@
   lightsBuffer.lights[v_4].position.y = (v_7 + (0.00100000004749745131f * (v_8 - (64.0f * floor((float(index) / 64.0f))))));
   uint v_9 = index;
   uint v_10 = min(v_9, (uint(lightsBuffer.lights.length()) - 1u));
-  if ((lightsBuffer.lights[v_10].position.y < v_2.inner.tint_symbol.y)) {
+  if ((lightsBuffer.lights[v_10].position.y < v_2.inner.member_0.y)) {
     uint v_11 = index;
     uint v_12 = min(v_11, (uint(lightsBuffer.lights.length()) - 1u));
-    lightsBuffer.lights[v_12].position.y = v_2.inner.tint_symbol_1.y;
+    lightsBuffer.lights[v_12].position.y = v_2.inner.member_1.y;
   }
   mat4 M = v_2.inner.projectionMatrix;
   float viewNear = (-(M[3u].z) / (-1.0f + M[2u].z));
@@ -194,5 +194,5 @@
 }
 layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_2_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/1136.wgsl.expected.glsl b/test/tint/bug/tint/1136.wgsl.expected.glsl
index c11ab9b..e69bf33 100644
--- a/test/tint/bug/tint/1136.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1136.wgsl.expected.glsl
@@ -6,10 +6,10 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   Buffer inner;
 } v;
-void tint_symbol_1() {
+void v_1() {
   v.inner.data = (v.inner.data + 1u);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/bug/tint/1509.wgsl.expected.glsl b/test/tint/bug/tint/1509.wgsl.expected.glsl
index e0cac1f..d4b26f5 100644
--- a/test/tint/bug/tint/1509.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1509.wgsl.expected.glsl
@@ -1002,7 +1002,7 @@
 uint v997 = 0u;
 uint v998 = 0u;
 uint v999 = 0u;
-layout(location = 0) out uint tint_symbol_loc0_Output;
+layout(location = 0) out uint main_loc0_Output;
 uint foo() {
   uint x = 0u;
   x = (x + v0);
@@ -2007,9 +2007,9 @@
   x = (x + v999);
   return x;
 }
-uint tint_symbol_inner() {
+uint main_inner() {
   return foo();
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/bug/tint/1520.spvasm.expected.glsl b/test/tint/bug/tint/1520.spvasm.expected.glsl
index 05621a6..917a7a8 100644
--- a/test/tint/bug/tint/1520.spvasm.expected.glsl
+++ b/test/tint/bug/tint/1520.spvasm.expected.glsl
@@ -34,7 +34,7 @@
 bool sk_Clockwise = false;
 vec4 vcolor_S0 = vec4(0.0f);
 layout(location = 0) in vec4 tint_interstage_location0;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 ivec4 tint_div_v4i32(ivec4 lhs, ivec4 rhs) {
   uvec4 v_1 = uvec4(equal(lhs, ivec4((-2147483647 - 1))));
   bvec4 v_2 = bvec4((v_1 & uvec4(equal(rhs, ivec4(-1)))));
@@ -164,12 +164,12 @@
   output_S1 = x_116;
   sk_FragColor = x_125;
 }
-main_out tint_symbol_inner(bool sk_Clockwise_param, vec4 vcolor_S0_param) {
+main_out main_inner(bool sk_Clockwise_param, vec4 vcolor_S0_param) {
   sk_Clockwise = sk_Clockwise_param;
   vcolor_S0 = vcolor_S0_param;
   main_1();
   return main_out(sk_FragColor);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(gl_FrontFacing, tint_interstage_location0).sk_FragColor_1;
+  main_loc0_Output = main_inner(gl_FrontFacing, tint_interstage_location0).sk_FragColor_1;
 }
diff --git a/test/tint/bug/tint/1574.wgsl.expected.glsl b/test/tint/bug/tint/1574.wgsl.expected.glsl
index e73127c..2e2d4f8 100644
--- a/test/tint/bug/tint/1574.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1574.wgsl.expected.glsl
@@ -21,7 +21,7 @@
 } v_1;
 shared uint b_u32;
 shared int b_i32;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     atomicExchange(b_u32, 0u);
     atomicExchange(b_i32, 0);
@@ -58,5 +58,5 @@
 }
 layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/1641.wgsl.expected.glsl b/test/tint/bug/tint/1641.wgsl.expected.glsl
index c67b3c5..0b66712 100644
--- a/test/tint/bug/tint/1641.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1641.wgsl.expected.glsl
@@ -5,12 +5,12 @@
   vec3 f;
 };
 
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   int zero = 0;
   return vec4(Normals[1](Normals(vec3(0.0f, 0.0f, 1.0f)))[min(uint(zero), 0u)].f, 1.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/1677.wgsl.expected.glsl b/test/tint/bug/tint/1677.wgsl.expected.glsl
index e742e7a..3574e4b 100644
--- a/test/tint/bug/tint/1677.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1677.wgsl.expected.glsl
@@ -7,13 +7,13 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer input_block_1_ssbo {
   Input inner;
 } v;
-void tint_symbol_1_inner(uvec3 id) {
+void main_inner(uvec3 id) {
   ivec3 pos = (v.inner.position - ivec3(0));
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/1725.wgsl.expected.glsl b/test/tint/bug/tint/1725.wgsl.expected.glsl
index 541bc8f..6210f60 100644
--- a/test/tint/bug/tint/1725.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1725.wgsl.expected.glsl
@@ -1,17 +1,17 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
-  uint inner[];
+buffer tint_struct_1_ssbo {
+  uint member_0[];
 } v;
-void tint_symbol_1_inner(uint tint_symbol_2) {
-  int tint_symbol_3 = 0;
-  int tint_symbol_4 = 0;
-  int tint_symbol_5 = 0;
-  uint v_1 = min(tint_symbol_2, (uint(v.inner.length()) - 1u));
-  uint tint_symbol_6 = v.inner[v_1];
+void v_1(uint v_2) {
+  int v_3 = 0;
+  int v_4 = 0;
+  int v_5 = 0;
+  uint v_6 = min(v_2, (uint(v.member_0.length()) - 1u));
+  uint v_7 = v.member_0[v_6];
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_LocalInvocationIndex);
+  v_1(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/1735.wgsl.expected.glsl b/test/tint/bug/tint/1735.wgsl.expected.glsl
index 868a909..6666988 100644
--- a/test/tint/bug/tint/1735.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1735.wgsl.expected.glsl
@@ -6,11 +6,11 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer in_block_1_ssbo {
   S inner;
 } v;
 layout(binding = 1, std430)
-buffer tint_symbol_1_block_1_ssbo {
+buffer out_block_1_ssbo {
   S inner;
 } v_1;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/bug/tint/1764.wgsl.expected.glsl b/test/tint/bug/tint/1764.wgsl.expected.glsl
index d26276d..059ecb9 100644
--- a/test/tint/bug/tint/1764.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1764.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int W[246];
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v = 0u;
     v = tint_local_index;
@@ -22,5 +22,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/1820.wgsl.expected.glsl b/test/tint/bug/tint/1820.wgsl.expected.glsl
index 0fc32fb..f8a48f9 100644
--- a/test/tint/bug/tint/1820.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1820.wgsl.expected.glsl
@@ -24,7 +24,7 @@
     }
   }
 }
-void tint_symbol() {
+void v() {
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/bug/tint/1860.wgsl.expected.glsl b/test/tint/bug/tint/1860.wgsl.expected.glsl
index 2ccf77a..37c5516 100644
--- a/test/tint/bug/tint/1860.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1860.wgsl.expected.glsl
@@ -9,11 +9,11 @@
 uniform v_declared_after_usage_block_ubo {
   DeclaredAfterUsage inner;
 } v;
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   return vec4(v.inner.f);
 }
 void main() {
-  gl_Position = tint_symbol_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/1926.wgsl.expected.glsl b/test/tint/bug/tint/1926.wgsl.expected.glsl
index 87e0025..179ba7d 100644
--- a/test/tint/bug/tint/1926.wgsl.expected.glsl
+++ b/test/tint/bug/tint/1926.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 
 shared uint sh_atomic_failed;
 layout(binding = 4, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer output_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol_1_inner(uvec3 global_id, uvec3 local_id, uint tint_local_index) {
+void main_inner(uvec3 global_id, uvec3 local_id, uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     sh_atomic_failed = 0u;
   }
@@ -20,5 +20,5 @@
 }
 layout(local_size_x = 256, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_GlobalInvocationID, gl_LocalInvocationID, gl_LocalInvocationIndex);
+  main_inner(gl_GlobalInvocationID, gl_LocalInvocationID, gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/2010.spvasm.expected.glsl b/test/tint/bug/tint/2010.spvasm.expected.glsl
index 875ea5f..3ed0e9b 100644
--- a/test/tint/bug/tint/2010.spvasm.expected.glsl
+++ b/test/tint/bug/tint/2010.spvasm.expected.glsl
@@ -139,7 +139,7 @@
   float v_6 = uintBitsToFloat(atomicOr(x_36, 0u));
   x_12.field0[v_3] = vec4(v_4, v_5, v_6, uintBitsToFloat(atomicOr(x_37, 0u)));
 }
-void tint_symbol_inner(uvec3 x_3_param, uint tint_local_index) {
+void main_inner(uvec3 x_3_param, uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     atomicExchange(x_34, 0u);
     atomicExchange(x_35, 0u);
@@ -167,5 +167,5 @@
 }
 layout(local_size_x = 32, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationID, gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationID, gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/2038.wgsl.expected.glsl b/test/tint/bug/tint/2038.wgsl.expected.glsl
index 7a77627..44814be 100644
--- a/test/tint/bug/tint/2038.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2038.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer output_block_1_ssbo {
   uint inner[2];
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/bug/tint/2039.wgsl.expected.glsl b/test/tint/bug/tint/2039.wgsl.expected.glsl
index 2165a8c..958b112 100644
--- a/test/tint/bug/tint/2039.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2039.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  uint tint_symbol_1 = 0u;
+  uint v = 0u;
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
@@ -31,7 +31,7 @@
         }
         continue;
       }
-      tint_symbol_1 = (tint_symbol_1 + 1u);
+      v = (v + 1u);
       {
         uint tint_low_inc = (tint_loop_idx.x + 1u);
         tint_loop_idx.x = tint_low_inc;
diff --git a/test/tint/bug/tint/2054.wgsl.expected.glsl b/test/tint/bug/tint/2054.wgsl.expected.glsl
index 8923f7f..e77af5a 100644
--- a/test/tint/bug/tint/2054.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2054.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   float inner;
 } v;
 void bar(inout float p) {
diff --git a/test/tint/bug/tint/2069.wgsl.expected.glsl b/test/tint/bug/tint/2069.wgsl.expected.glsl
index 608c896..cd11966 100644
--- a/test/tint/bug/tint/2069.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2069.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
diff --git a/test/tint/bug/tint/2100.wgsl.expected.glsl b/test/tint/bug/tint/2100.wgsl.expected.glsl
index 5249f52..4ee4765 100644
--- a/test/tint/bug/tint/2100.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2100.wgsl.expected.glsl
@@ -12,15 +12,15 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_block_std140_ubo {
+uniform v_buffer_block_std140_ubo {
   S_std140 inner;
 } v;
-vec4 tint_symbol_1_inner() {
+vec4 main_inner() {
   float x = v.inner.matrix_view[0u].z;
   return vec4(x, 0.0f, 0.0f, 1.0f);
 }
 void main() {
-  gl_Position = tint_symbol_1_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/2121.wgsl.expected.glsl b/test/tint/bug/tint/2121.wgsl.expected.glsl
index 4abefb8..4273a12 100644
--- a/test/tint/bug/tint/2121.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2121.wgsl.expected.glsl
@@ -5,17 +5,17 @@
   vec4 pos;
 };
 
-void foo(inout VSOut tint_symbol) {
+void foo(inout VSOut v) {
   vec4 pos = vec4(1.0f, 2.0f, 3.0f, 4.0f);
-  tint_symbol.pos = pos;
+  v.pos = pos;
 }
-VSOut tint_symbol_1_inner() {
-  VSOut tint_symbol = VSOut(vec4(0.0f));
-  foo(tint_symbol);
-  return tint_symbol;
+VSOut main_inner() {
+  VSOut v_1 = VSOut(vec4(0.0f));
+  foo(v_1);
+  return v_1;
 }
 void main() {
-  gl_Position = tint_symbol_1_inner().pos;
+  gl_Position = main_inner().pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/2147.wgsl.expected.glsl b/test/tint/bug/tint/2147.wgsl.expected.glsl
index defc2d9..206446e 100644
--- a/test/tint/bug/tint/2147.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2147.wgsl.expected.glsl
@@ -13,8 +13,8 @@
   int inner;
 } v;
 bool continue_execution = true;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   if (false) {
     continue_execution = false;
   }
@@ -31,5 +31,5 @@
   return v_3;
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/bug/tint/2175.wgsl.expected.glsl b/test/tint/bug/tint/2175.wgsl.expected.glsl
index 8c0dae6..baa1b1b 100644
--- a/test/tint/bug/tint/2175.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2175.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_2_block_1_ssbo {
-  uint inner;
+buffer tint_struct_1_ssbo {
+  uint member_0;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  v.inner = 0u;
+  v.member_0 = 0u;
 }
diff --git a/test/tint/bug/tint/2237.wgsl.expected.glsl b/test/tint/bug/tint/2237.wgsl.expected.glsl
index 666ec25..3fdfb81 100644
--- a/test/tint/bug/tint/2237.wgsl.expected.glsl
+++ b/test/tint/bug/tint/2237.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   uint inner;
 } v_1;
 uint foo() {
diff --git a/test/tint/bug/tint/292.wgsl.expected.glsl b/test/tint/bug/tint/292.wgsl.expected.glsl
index b9ffd9e..caf5277 100644
--- a/test/tint/bug/tint/292.wgsl.expected.glsl
+++ b/test/tint/bug/tint/292.wgsl.expected.glsl
@@ -1,12 +1,12 @@
 #version 310 es
 
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   vec3 light = vec3(1.20000004768371582031f, 1.0f, 2.0f);
   vec3 negative_light = -(light);
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/349291130.wgsl.expected.glsl b/test/tint/bug/tint/349291130.wgsl.expected.glsl
index 48d0151..b1ca915 100644
--- a/test/tint/bug/tint/349291130.wgsl.expected.glsl
+++ b/test/tint/bug/tint/349291130.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 layout(local_size_x = 6, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/bug/tint/354627692.wgsl.expected.glsl b/test/tint/bug/tint/354627692.wgsl.expected.glsl
index 361c47f..2bb2984 100644
--- a/test/tint/bug/tint/354627692.wgsl.expected.glsl
+++ b/test/tint/bug/tint/354627692.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   int inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/bug/tint/366314931.wgsl.expected.glsl b/test/tint/bug/tint/366314931.wgsl.expected.glsl
index 821826a..67ad4dc 100644
--- a/test/tint/bug/tint/366314931.wgsl.expected.glsl
+++ b/test/tint/bug/tint/366314931.wgsl.expected.glsl
@@ -8,10 +8,10 @@
 
 shared S wgvar;
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer output_block_1_ssbo {
   S inner;
 } v_1;
-void tint_symbol_1_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     wgvar.v = uvec3(0u);
     atomicExchange(wgvar.u, 0u);
@@ -22,5 +22,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/379127084.wgsl.expected.glsl b/test/tint/bug/tint/379127084.wgsl.expected.glsl
index 94cf36f..6d51b77 100644
--- a/test/tint/bug/tint/379127084.wgsl.expected.glsl
+++ b/test/tint/bug/tint/379127084.wgsl.expected.glsl
@@ -36,7 +36,7 @@
 uniform highp sampler2D noiseSampler_1_Texture_noiseSampler_1_Sampler;
 layout(location = 0) flat in uvec2 tint_interstage_location0;
 layout(location = 1) in vec2 tint_interstage_location1;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 void _skslMain(FSIn _stageIn, inout FSOut _stageOut) {
   shadingSsboIndex = _stageIn.ssboIndicesVar.y;
   uint v = shadingSsboIndex;
@@ -227,11 +227,11 @@
   vec4 outColor_0 = _94_f;
   _stageOut.sk_FragColor = outColor_0;
 }
-FSOut tint_symbol_inner(FSIn _stageIn) {
+FSOut main_inner(FSIn _stageIn) {
   FSOut _stageOut = FSOut(vec4(0.0f));
   _skslMain(_stageIn, _stageOut);
   return _stageOut;
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(FSIn(tint_interstage_location0, tint_interstage_location1)).sk_FragColor;
+  main_loc0_Output = main_inner(FSIn(tint_interstage_location0, tint_interstage_location1)).sk_FragColor;
 }
diff --git a/test/tint/bug/tint/379684039-2.wgsl.expected.glsl b/test/tint/bug/tint/379684039-2.wgsl.expected.glsl
index 77ab1d4..1f03ac0 100644
--- a/test/tint/bug/tint/379684039-2.wgsl.expected.glsl
+++ b/test/tint/bug/tint/379684039-2.wgsl.expected.glsl
@@ -13,7 +13,7 @@
 buffer FSUniforms_1_ssbo {
   FSUniformData fsUniformData[];
 } _storage;
-void tint_symbol() {
+void v() {
   ivec2 vec = ivec2(0);
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -21,10 +21,10 @@
       if (all(equal(tint_loop_idx, uvec2(4294967295u)))) {
         break;
       }
-      int v = vec.y;
-      uint v_1 = idx;
-      uint v_2 = min(v_1, (uint(_storage.fsUniformData.length()) - 1u));
-      if ((v >= _storage.fsUniformData[v_2].size.y)) {
+      int v_1 = vec.y;
+      uint v_2 = idx;
+      uint v_3 = min(v_2, (uint(_storage.fsUniformData.length()) - 1u));
+      if ((v_1 >= _storage.fsUniformData[v_3].size.y)) {
         break;
       }
       {
diff --git a/test/tint/bug/tint/379684039.wgsl.expected.glsl b/test/tint/bug/tint/379684039.wgsl.expected.glsl
index dd7460b..4bf270d 100644
--- a/test/tint/bug/tint/379684039.wgsl.expected.glsl
+++ b/test/tint/bug/tint/379684039.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer _storage_block_1_ssbo {
   ivec2 inner;
 } v;
-void tint_symbol() {
+void v_1() {
   ivec2 vec = ivec2(0);
   {
     uvec2 tint_loop_idx = uvec2(0u);
diff --git a/test/tint/bug/tint/403.wgsl.expected.glsl b/test/tint/bug/tint/403.wgsl.expected.glsl
index 966ceb4..14e9f44 100644
--- a/test/tint/bug/tint/403.wgsl.expected.glsl
+++ b/test/tint/bug/tint/403.wgsl.expected.glsl
@@ -19,18 +19,18 @@
 uniform v_x_26_block_std140_ubo {
   vertexUniformBuffer2_std140 inner;
 } v_1;
-vec4 tint_symbol_inner(uint tint_symbol_1) {
+vec4 main_inner(uint v_2) {
   vec2 indexable[3] = vec2[3](vec2(0.0f), vec2(0.0f), vec2(0.0f));
   mat2 x_23 = mat2(v.inner.transform1_col0, v.inner.transform1_col1);
   mat2 x_28 = mat2(v_1.inner.transform2_col0, v_1.inner.transform2_col1);
-  uint x_46 = tint_symbol_1;
+  uint x_46 = v_2;
   indexable = vec2[3](vec2(-1.0f, 1.0f), vec2(1.0f), vec2(-1.0f));
   vec2 x_51 = indexable[min(x_46, 2u)];
   vec2 x_52 = (mat2((x_23[0u] + x_28[0u]), (x_23[1u] + x_28[1u])) * x_51);
   return vec4(x_52.x, x_52.y, 0.0f, 1.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(uint(gl_VertexID));
+  gl_Position = main_inner(uint(gl_VertexID));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/413.spvasm.expected.glsl b/test/tint/bug/tint/413.spvasm.expected.glsl
index 75fac3d..8ca4da9 100644
--- a/test/tint/bug/tint/413.spvasm.expected.glsl
+++ b/test/tint/bug/tint/413.spvasm.expected.glsl
@@ -8,7 +8,7 @@
 
 layout(binding = 1, r32ui) uniform highp writeonly uimage2D Dst;
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D Src;
diff --git a/test/tint/bug/tint/453.wgsl.expected.glsl b/test/tint/bug/tint/453.wgsl.expected.glsl
index aac7f7a..a7b2343 100644
--- a/test/tint/bug/tint/453.wgsl.expected.glsl
+++ b/test/tint/bug/tint/453.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 
 layout(binding = 1, r32ui) uniform highp writeonly uimage2D Dst;
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D Src;
diff --git a/test/tint/bug/tint/534.wgsl.expected.glsl b/test/tint/bug/tint/534.wgsl.expected.glsl
index e4901fb..c343175 100644
--- a/test/tint/bug/tint/534.wgsl.expected.glsl
+++ b/test/tint/bug/tint/534.wgsl.expected.glsl
@@ -16,15 +16,15 @@
 layout(binding = 2, std430)
 buffer OutputBuf_1_ssbo {
   uint result[];
-} tint_symbol;
+} v;
 layout(binding = 3, std140)
 uniform uniforms_block_1_ubo {
   Uniforms inner;
-} v;
-layout(binding = 0, std140)
-uniform tint_symbol_2_1_ubo {
-  TintTextureUniformData inner;
 } v_1;
+layout(binding = 0, std140)
+uniform tint_symbol_1_ubo {
+  TintTextureUniformData inner;
+} v_2;
 uniform highp sampler2D src;
 uniform highp sampler2D dst;
 uint ConvertToFp16FloatValue(float fp32) {
@@ -33,23 +33,23 @@
 uvec4 tint_v4f32_to_v4u32(vec4 value) {
   return mix(uvec4(4294967295u), mix(uvec4(0u), uvec4(value), greaterThanEqual(value, vec4(0.0f))), lessThanEqual(value, vec4(4294967040.0f)));
 }
-void tint_symbol_1_inner(uvec3 GlobalInvocationID) {
+void main_inner(uvec3 GlobalInvocationID) {
   uvec2 size = uvec2(textureSize(src, 0));
   uvec2 dstTexCoord = GlobalInvocationID.xy;
   uvec2 srcTexCoord = dstTexCoord;
-  if ((v.inner.dstTextureFlipY == 1u)) {
+  if ((v_1.inner.dstTextureFlipY == 1u)) {
     srcTexCoord.y = ((size.y - dstTexCoord.y) - 1u);
   }
-  uvec2 v_2 = srcTexCoord;
-  uint v_3 = (v_1.inner.tint_builtin_value_0 - 1u);
-  uint v_4 = min(uint(0), v_3);
-  ivec2 v_5 = ivec2(min(v_2, (uvec2(textureSize(src, int(v_4))) - uvec2(1u))));
-  vec4 srcColor = texelFetch(src, v_5, int(v_4));
-  uvec2 v_6 = dstTexCoord;
-  uint v_7 = (v_1.inner.tint_builtin_value_1 - 1u);
-  uint v_8 = min(uint(0), v_7);
-  ivec2 v_9 = ivec2(min(v_6, (uvec2(textureSize(dst, int(v_8))) - uvec2(1u))));
-  vec4 dstColor = texelFetch(dst, v_9, int(v_8));
+  uvec2 v_3 = srcTexCoord;
+  uint v_4 = (v_2.inner.tint_builtin_value_0 - 1u);
+  uint v_5 = min(uint(0), v_4);
+  ivec2 v_6 = ivec2(min(v_3, (uvec2(textureSize(src, int(v_5))) - uvec2(1u))));
+  vec4 srcColor = texelFetch(src, v_6, int(v_5));
+  uvec2 v_7 = dstTexCoord;
+  uint v_8 = (v_2.inner.tint_builtin_value_1 - 1u);
+  uint v_9 = min(uint(0), v_8);
+  ivec2 v_10 = ivec2(min(v_7, (uvec2(textureSize(dst, int(v_9))) - uvec2(1u))));
+  vec4 dstColor = texelFetch(dst, v_10, int(v_9));
   bool success = true;
   uvec4 srcColorBits = uvec4(0u);
   uvec4 dstColorBits = tint_v4f32_to_v4u32(dstColor);
@@ -60,19 +60,19 @@
       if (all(equal(tint_loop_idx, uvec2(4294967295u)))) {
         break;
       }
-      if ((i < v.inner.channelCount)) {
+      if ((i < v_1.inner.channelCount)) {
       } else {
         break;
       }
-      uint v_10 = i;
-      srcColorBits[min(v_10, 3u)] = ConvertToFp16FloatValue(srcColor[min(i, 3u)]);
-      bool v_11 = false;
+      uint v_11 = i;
+      srcColorBits[min(v_11, 3u)] = ConvertToFp16FloatValue(srcColor[min(i, 3u)]);
+      bool v_12 = false;
       if (success) {
-        v_11 = (srcColorBits[min(i, 3u)] == dstColorBits[min(i, 3u)]);
+        v_12 = (srcColorBits[min(i, 3u)] == dstColorBits[min(i, 3u)]);
       } else {
-        v_11 = false;
+        v_12 = false;
       }
-      success = v_11;
+      success = v_12;
       {
         uint tint_low_inc = (tint_loop_idx.x + 1u);
         tint_loop_idx.x = tint_low_inc;
@@ -85,16 +85,16 @@
   }
   uint outputIndex = ((GlobalInvocationID.y * uint(size.x)) + GlobalInvocationID.x);
   if (success) {
-    uint v_12 = outputIndex;
-    uint v_13 = min(v_12, (uint(tint_symbol.result.length()) - 1u));
-    tint_symbol.result[v_13] = 1u;
+    uint v_13 = outputIndex;
+    uint v_14 = min(v_13, (uint(v.result.length()) - 1u));
+    v.result[v_14] = 1u;
   } else {
-    uint v_14 = outputIndex;
-    uint v_15 = min(v_14, (uint(tint_symbol.result.length()) - 1u));
-    tint_symbol.result[v_15] = 0u;
+    uint v_15 = outputIndex;
+    uint v_16 = min(v_15, (uint(v.result.length()) - 1u));
+    v.result[v_16] = 0u;
   }
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/744.wgsl.expected.glsl b/test/tint/bug/tint/744.wgsl.expected.glsl
index f55f0bb..f46d78c 100644
--- a/test/tint/bug/tint/744.wgsl.expected.glsl
+++ b/test/tint/bug/tint/744.wgsl.expected.glsl
@@ -23,7 +23,7 @@
 uniform uniforms_block_1_ubo {
   Uniforms inner;
 } v;
-void tint_symbol_inner(uvec3 global_id) {
+void main_inner(uvec3 global_id) {
   uvec2 resultCell = uvec2(global_id.y, global_id.x);
   uint dimInner = v.inner.aShape.y;
   uint dimOutter = v.inner.outShape.y;
@@ -54,5 +54,5 @@
 }
 layout(local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/757.wgsl.expected.glsl b/test/tint/bug/tint/757.wgsl.expected.glsl
index eef7783..c0b867c 100644
--- a/test/tint/bug/tint/757.wgsl.expected.glsl
+++ b/test/tint/bug/tint/757.wgsl.expected.glsl
@@ -10,11 +10,11 @@
   float values[];
 } result;
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray myTexture;
-void tint_symbol_inner(uvec3 GlobalInvocationID) {
+void main_inner(uvec3 GlobalInvocationID) {
   uint flatIndex = (((4u * GlobalInvocationID.z) + (2u * GlobalInvocationID.y)) + GlobalInvocationID.x);
   flatIndex = (flatIndex * 1u);
   ivec2 v_1 = ivec2(GlobalInvocationID.xy);
@@ -45,5 +45,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/824.wgsl.expected.glsl b/test/tint/bug/tint/824.wgsl.expected.glsl
index efeebd9..545d1c7 100644
--- a/test/tint/bug/tint/824.wgsl.expected.glsl
+++ b/test/tint/bug/tint/824.wgsl.expected.glsl
@@ -12,22 +12,22 @@
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
 layout(location = 0) out vec4 tint_interstage_location0;
-Output tint_symbol_inner(uint VertexIndex, uint InstanceIndex) {
+Output main_inner(uint VertexIndex, uint InstanceIndex) {
   vec2 zv[4] = vec2[4](vec2(0.20000000298023223877f), vec2(0.30000001192092895508f), vec2(-0.10000000149011611938f), vec2(1.10000002384185791016f));
   float z = zv[min(InstanceIndex, 3u)].x;
-  Output tint_symbol_1 = Output(vec4(0.0f), vec4(0.0f));
-  tint_symbol_1.Position = vec4(0.5f, 0.5f, z, 1.0f);
+  Output v = Output(vec4(0.0f), vec4(0.0f));
+  v.Position = vec4(0.5f, 0.5f, z, 1.0f);
   vec4 colors[4] = vec4[4](vec4(1.0f, 0.0f, 0.0f, 1.0f), vec4(0.0f, 1.0f, 0.0f, 1.0f), vec4(0.0f, 0.0f, 1.0f, 1.0f), vec4(1.0f));
-  tint_symbol_1.color = colors[min(InstanceIndex, 3u)];
-  return tint_symbol_1;
+  v.color = colors[min(InstanceIndex, 3u)];
+  return v;
 }
 void main() {
-  uint v = uint(gl_VertexID);
-  uint v_1 = uint(gl_InstanceID);
-  Output v_2 = tint_symbol_inner(v, (v_1 + tint_push_constants.tint_first_instance));
-  gl_Position = v_2.Position;
+  uint v_1 = uint(gl_VertexID);
+  uint v_2 = uint(gl_InstanceID);
+  Output v_3 = main_inner(v_1, (v_2 + tint_push_constants.tint_first_instance));
+  gl_Position = v_3.Position;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.color;
+  tint_interstage_location0 = v_3.color;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/bug/tint/827.wgsl.expected.glsl b/test/tint/bug/tint/827.wgsl.expected.glsl
index c6863b0..2179ec6 100644
--- a/test/tint/bug/tint/827.wgsl.expected.glsl
+++ b/test/tint/bug/tint/827.wgsl.expected.glsl
@@ -10,11 +10,11 @@
   float values[];
 } result;
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D tex;
-void tint_symbol_inner(uvec3 GlobalInvocationId) {
+void main_inner(uvec3 GlobalInvocationId) {
   uint v_1 = min(((GlobalInvocationId.y * 128u) + GlobalInvocationId.x), (uint(result.values.length()) - 1u));
   int v_2 = int(GlobalInvocationId.x);
   ivec2 v_3 = ivec2(v_2, int(GlobalInvocationId.y));
@@ -26,5 +26,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/913.wgsl.expected.glsl b/test/tint/bug/tint/913.wgsl.expected.glsl
index 7cdb9b5..08159d2 100644
--- a/test/tint/bug/tint/913.wgsl.expected.glsl
+++ b/test/tint/bug/tint/913.wgsl.expected.glsl
@@ -17,126 +17,126 @@
 layout(binding = 2, std430)
 buffer OutputBuf_1_ssbo {
   uint result[];
-} tint_symbol;
+} v;
 layout(binding = 3, std140)
 uniform uniforms_block_1_ubo {
   Uniforms inner;
-} v;
-layout(binding = 0, std140)
-uniform tint_symbol_2_1_ubo {
-  TintTextureUniformData inner;
 } v_1;
+layout(binding = 0, std140)
+uniform tint_symbol_1_ubo {
+  TintTextureUniformData inner;
+} v_2;
 uniform highp sampler2D src;
 uniform highp sampler2D dst;
 bool aboutEqual(float value, float expect) {
   return (abs((value - expect)) < 0.00100000004749745131f);
 }
-void tint_symbol_1_inner(uvec3 GlobalInvocationID) {
+void main_inner(uvec3 GlobalInvocationID) {
   uvec2 srcSize = uvec2(textureSize(src, 0));
   uvec2 dstSize = uvec2(textureSize(dst, 0));
   uvec2 dstTexCoord = uvec2(GlobalInvocationID.xy);
   vec4 nonCoveredColor = vec4(0.0f, 1.0f, 0.0f, 1.0f);
   bool success = true;
-  bool v_2 = false;
-  if ((dstTexCoord.x < v.inner.dstCopyOrigin.x)) {
-    v_2 = true;
-  } else {
-    v_2 = (dstTexCoord.y < v.inner.dstCopyOrigin.y);
-  }
   bool v_3 = false;
-  if (v_2) {
+  if ((dstTexCoord.x < v_1.inner.dstCopyOrigin.x)) {
     v_3 = true;
   } else {
-    v_3 = (dstTexCoord.x >= (v.inner.dstCopyOrigin.x + v.inner.copySize.x));
+    v_3 = (dstTexCoord.y < v_1.inner.dstCopyOrigin.y);
   }
   bool v_4 = false;
   if (v_3) {
     v_4 = true;
   } else {
-    v_4 = (dstTexCoord.y >= (v.inner.dstCopyOrigin.y + v.inner.copySize.y));
+    v_4 = (dstTexCoord.x >= (v_1.inner.dstCopyOrigin.x + v_1.inner.copySize.x));
   }
+  bool v_5 = false;
   if (v_4) {
-    bool v_5 = false;
-    if (success) {
-      ivec2 v_6 = ivec2(dstTexCoord);
-      uint v_7 = (v_1.inner.tint_builtin_value_1 - 1u);
-      uint v_8 = min(uint(0), v_7);
-      uvec2 v_9 = (uvec2(textureSize(dst, int(v_8))) - uvec2(1u));
-      ivec2 v_10 = ivec2(min(uvec2(v_6), v_9));
-      v_5 = all(equal(texelFetch(dst, v_10, int(v_8)), nonCoveredColor));
-    } else {
-      v_5 = false;
-    }
-    success = v_5;
+    v_5 = true;
   } else {
-    uvec2 srcTexCoord = ((dstTexCoord - v.inner.dstCopyOrigin) + v.inner.srcCopyOrigin);
-    if ((v.inner.dstTextureFlipY == 1u)) {
+    v_5 = (dstTexCoord.y >= (v_1.inner.dstCopyOrigin.y + v_1.inner.copySize.y));
+  }
+  if (v_5) {
+    bool v_6 = false;
+    if (success) {
+      ivec2 v_7 = ivec2(dstTexCoord);
+      uint v_8 = (v_2.inner.tint_builtin_value_1 - 1u);
+      uint v_9 = min(uint(0), v_8);
+      uvec2 v_10 = (uvec2(textureSize(dst, int(v_9))) - uvec2(1u));
+      ivec2 v_11 = ivec2(min(uvec2(v_7), v_10));
+      v_6 = all(equal(texelFetch(dst, v_11, int(v_9)), nonCoveredColor));
+    } else {
+      v_6 = false;
+    }
+    success = v_6;
+  } else {
+    uvec2 srcTexCoord = ((dstTexCoord - v_1.inner.dstCopyOrigin) + v_1.inner.srcCopyOrigin);
+    if ((v_1.inner.dstTextureFlipY == 1u)) {
       srcTexCoord.y = ((srcSize.y - srcTexCoord.y) - 1u);
     }
-    ivec2 v_11 = ivec2(srcTexCoord);
-    uint v_12 = (v_1.inner.tint_builtin_value_0 - 1u);
-    uint v_13 = min(uint(0), v_12);
-    uvec2 v_14 = (uvec2(textureSize(src, int(v_13))) - uvec2(1u));
-    ivec2 v_15 = ivec2(min(uvec2(v_11), v_14));
-    vec4 srcColor = texelFetch(src, v_15, int(v_13));
-    ivec2 v_16 = ivec2(dstTexCoord);
-    uint v_17 = (v_1.inner.tint_builtin_value_1 - 1u);
-    uint v_18 = min(uint(0), v_17);
-    uvec2 v_19 = (uvec2(textureSize(dst, int(v_18))) - uvec2(1u));
-    ivec2 v_20 = ivec2(min(uvec2(v_16), v_19));
-    vec4 dstColor = texelFetch(dst, v_20, int(v_18));
-    if ((v.inner.channelCount == 2u)) {
-      bool v_21 = false;
-      if (success) {
-        v_21 = aboutEqual(dstColor.x, srcColor.x);
-      } else {
-        v_21 = false;
-      }
+    ivec2 v_12 = ivec2(srcTexCoord);
+    uint v_13 = (v_2.inner.tint_builtin_value_0 - 1u);
+    uint v_14 = min(uint(0), v_13);
+    uvec2 v_15 = (uvec2(textureSize(src, int(v_14))) - uvec2(1u));
+    ivec2 v_16 = ivec2(min(uvec2(v_12), v_15));
+    vec4 srcColor = texelFetch(src, v_16, int(v_14));
+    ivec2 v_17 = ivec2(dstTexCoord);
+    uint v_18 = (v_2.inner.tint_builtin_value_1 - 1u);
+    uint v_19 = min(uint(0), v_18);
+    uvec2 v_20 = (uvec2(textureSize(dst, int(v_19))) - uvec2(1u));
+    ivec2 v_21 = ivec2(min(uvec2(v_17), v_20));
+    vec4 dstColor = texelFetch(dst, v_21, int(v_19));
+    if ((v_1.inner.channelCount == 2u)) {
       bool v_22 = false;
-      if (v_21) {
-        v_22 = aboutEqual(dstColor.y, srcColor.y);
+      if (success) {
+        v_22 = aboutEqual(dstColor.x, srcColor.x);
       } else {
         v_22 = false;
       }
-      success = v_22;
-    } else {
       bool v_23 = false;
-      if (success) {
-        v_23 = aboutEqual(dstColor.x, srcColor.x);
+      if (v_22) {
+        v_23 = aboutEqual(dstColor.y, srcColor.y);
       } else {
         v_23 = false;
       }
+      success = v_23;
+    } else {
       bool v_24 = false;
-      if (v_23) {
-        v_24 = aboutEqual(dstColor.y, srcColor.y);
+      if (success) {
+        v_24 = aboutEqual(dstColor.x, srcColor.x);
       } else {
         v_24 = false;
       }
       bool v_25 = false;
       if (v_24) {
-        v_25 = aboutEqual(dstColor.z, srcColor.z);
+        v_25 = aboutEqual(dstColor.y, srcColor.y);
       } else {
         v_25 = false;
       }
       bool v_26 = false;
       if (v_25) {
-        v_26 = aboutEqual(dstColor.w, srcColor.w);
+        v_26 = aboutEqual(dstColor.z, srcColor.z);
       } else {
         v_26 = false;
       }
-      success = v_26;
+      bool v_27 = false;
+      if (v_26) {
+        v_27 = aboutEqual(dstColor.w, srcColor.w);
+      } else {
+        v_27 = false;
+      }
+      success = v_27;
     }
   }
   uint outputIndex = ((GlobalInvocationID.y * dstSize.x) + GlobalInvocationID.x);
   if (success) {
-    uint v_27 = min(outputIndex, (uint(tint_symbol.result.length()) - 1u));
-    tint_symbol.result[v_27] = 1u;
+    uint v_28 = min(outputIndex, (uint(v.result.length()) - 1u));
+    v.result[v_28] = 1u;
   } else {
-    uint v_28 = min(outputIndex, (uint(tint_symbol.result.length()) - 1u));
-    tint_symbol.result[v_28] = 0u;
+    uint v_29 = min(outputIndex, (uint(v.result.length()) - 1u));
+    v.result[v_29] = 0u;
   }
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/914.wgsl.expected.glsl b/test/tint/bug/tint/914.wgsl.expected.glsl
index 3c05395..a678f48 100644
--- a/test/tint/bug/tint/914.wgsl.expected.glsl
+++ b/test/tint/bug/tint/914.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 uint tint_div_u32(uint lhs, uint rhs) {
   return (lhs / mix(rhs, 1u, (rhs == 0u)));
 }
-void tint_symbol_inner(uvec3 local_id, uvec3 global_id, uint tint_local_index) {
+void main_inner(uvec3 local_id, uvec3 global_id, uint tint_local_index) {
   {
     uint v_9 = 0u;
     v_9 = tint_local_index;
@@ -285,5 +285,5 @@
 }
 layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationID, gl_GlobalInvocationID, gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationID, gl_GlobalInvocationID, gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/922.wgsl.expected.glsl b/test/tint/bug/tint/922.wgsl.expected.glsl
index ac30e3c..5aa45d1 100644
--- a/test/tint/bug/tint/922.wgsl.expected.glsl
+++ b/test/tint/bug/tint/922.wgsl.expected.glsl
@@ -57,12 +57,12 @@
 float a_PosMtxIdx1 = 0.0f;
 vec4 v_Color = vec4(0.0f);
 vec2 v_TexCoord = vec2(0.0f);
-vec4 tint_symbol = vec4(0.0f);
-layout(location = 0) in vec3 tint_symbol_1_loc0_Input;
-layout(location = 1) in vec2 tint_symbol_1_loc1_Input;
-layout(location = 2) in vec4 tint_symbol_1_loc2_Input;
-layout(location = 3) in vec3 tint_symbol_1_loc3_Input;
-layout(location = 4) in float tint_symbol_1_loc4_Input;
+vec4 v_4 = vec4(0.0f);
+layout(location = 0) in vec3 main_loc0_Input;
+layout(location = 1) in vec2 main_loc1_Input;
+layout(location = 2) in vec4 main_loc2_Input;
+layout(location = 3) in vec3 main_loc3_Input;
+layout(location = 4) in float main_loc4_Input;
 layout(location = 0) out vec4 tint_interstage_location0;
 layout(location = 1) out vec2 tint_interstage_location1;
 vec4 Mul(Mat4x4_ m8, vec4 v) {
@@ -128,8 +128,8 @@
   Mat4x3_ t_PosMtx = Mat4x3_(vec4(0.0f), vec4(0.0f), vec4(0.0f));
   vec2 t_TexSpaceCoord = vec2(0.0f);
   float x_e15 = a_PosMtxIdx1;
-  uint v_4 = min(uint(tint_f32_to_i32(x_e15)), 31u);
-  Mat4x3_ x_e18 = v_3.inner.u_PosMtx[v_4];
+  uint v_5 = min(uint(tint_f32_to_i32(x_e15)), 31u);
+  Mat4x3_ x_e18 = v_3.inner.u_PosMtx[v_5];
   t_PosMtx = x_e18;
   Mat4x3_ x_e23 = t_PosMtx;
   Mat4x4_ x_e24 = x_Mat4x4_1(x_e23);
@@ -147,7 +147,7 @@
   vec3 x_e45 = a_Position1;
   vec4 x_e48 = Mul(x_e44, vec4(x_e45, 1.0f));
   vec4 x_e49 = Mul(x_e35, x_e48);
-  tint_symbol = x_e49;
+  v_4 = x_e49;
   vec4 x_e50 = a_Color1;
   v_Color = x_e50;
   vec4 x_e52 = v_2.inner.u_Misc0_;
@@ -168,7 +168,7 @@
   }
   /* unreachable */
 }
-VertexOutput tint_symbol_1_inner(vec3 a_Position, vec2 a_UV, vec4 a_Color, vec3 a_Normal, float a_PosMtxIdx) {
+VertexOutput main_inner(vec3 a_Position, vec2 a_UV, vec4 a_Color, vec3 a_Normal, float a_PosMtxIdx) {
   a_Position1 = a_Position;
   a_UV1 = a_UV;
   a_Color1 = a_Color;
@@ -177,14 +177,14 @@
   main1();
   vec4 x_e11 = v_Color;
   vec2 x_e13 = v_TexCoord;
-  vec4 x_e15 = tint_symbol;
+  vec4 x_e15 = v_4;
   return VertexOutput(x_e11, x_e13, x_e15);
 }
 void main() {
-  VertexOutput v_5 = tint_symbol_1_inner(tint_symbol_1_loc0_Input, tint_symbol_1_loc1_Input, tint_symbol_1_loc2_Input, tint_symbol_1_loc3_Input, tint_symbol_1_loc4_Input);
-  tint_interstage_location0 = v_5.v_Color;
-  tint_interstage_location1 = v_5.v_TexCoord;
-  gl_Position = v_5.member;
+  VertexOutput v_6 = main_inner(main_loc0_Input, main_loc1_Input, main_loc2_Input, main_loc3_Input, main_loc4_Input);
+  tint_interstage_location0 = v_6.v_Color;
+  tint_interstage_location1 = v_6.v_TexCoord;
+  gl_Position = v_6.member;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/bug/tint/942.wgsl.expected.glsl b/test/tint/bug/tint/942.wgsl.expected.glsl
index ddabaa2..a87e64c 100644
--- a/test/tint/bug/tint/942.wgsl.expected.glsl
+++ b/test/tint/bug/tint/942.wgsl.expected.glsl
@@ -26,14 +26,14 @@
 } v_1;
 shared vec3 tile[4][256];
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v_2;
 uniform highp sampler2D inputTex_samp;
 uint tint_div_u32(uint lhs, uint rhs) {
   return (lhs / mix(rhs, 1u, (rhs == 0u)));
 }
-void tint_symbol_inner(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint tint_local_index) {
+void main_inner(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint tint_local_index) {
   {
     uint v_3 = 0u;
     v_3 = tint_local_index;
@@ -170,5 +170,5 @@
 }
 layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_WorkGroupID, gl_LocalInvocationID, gl_LocalInvocationIndex);
+  main_inner(gl_WorkGroupID, gl_LocalInvocationID, gl_LocalInvocationIndex);
 }
diff --git a/test/tint/bug/tint/948.wgsl.expected.glsl b/test/tint/bug/tint/948.wgsl.expected.glsl
index 11d8e0c..3fd1bb2 100644
--- a/test/tint/bug/tint/948.wgsl.expected.glsl
+++ b/test/tint/bug/tint/948.wgsl.expected.glsl
@@ -45,7 +45,7 @@
 layout(location = 3) in vec2 tint_interstage_location3;
 layout(location = 0) in vec3 tint_interstage_location0;
 layout(location = 1) in vec2 tint_interstage_location1;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 mat4 getFrameData_f1_(inout float frameID) {
   float fX = 0.0f;
   float x_15 = frameID;
@@ -240,7 +240,7 @@
   vec4 x_318 = color;
   glFragColor = x_318;
 }
-main_out tint_symbol_inner(vec2 tUV_param, vec2 tileID_1_param, vec2 levelUnits_param, vec2 stageUnits_1_param, vec3 vPosition_param, vec2 vUV_param) {
+main_out main_inner(vec2 tUV_param, vec2 tileID_1_param, vec2 levelUnits_param, vec2 stageUnits_1_param, vec3 vPosition_param, vec2 vUV_param) {
   tUV = tUV_param;
   tileID_1 = tileID_1_param;
   levelUnits = levelUnits_param;
@@ -251,5 +251,5 @@
   return main_out(glFragColor);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(tint_interstage_location2, tint_interstage_location5, tint_interstage_location4, tint_interstage_location3, tint_interstage_location0, tint_interstage_location1).glFragColor_1;
+  main_loc0_Output = main_inner(tint_interstage_location2, tint_interstage_location5, tint_interstage_location4, tint_interstage_location3, tint_interstage_location0, tint_interstage_location1).glFragColor_1;
 }
diff --git a/test/tint/bug/tint/949.wgsl.expected.glsl b/test/tint/bug/tint/949.wgsl.expected.glsl
index fb5f961..d5495c81 100644
--- a/test/tint/bug/tint/949.wgsl.expected.glsl
+++ b/test/tint/bug/tint/949.wgsl.expected.glsl
@@ -46,13 +46,13 @@
   LeftOver inner;
 } v;
 vec4 v_output1 = vec4(0.0f);
-bool tint_symbol = false;
+bool v_1 = false;
 vec2 v_uv = vec2(0.0f);
 vec4 v_output2 = vec4(0.0f);
 layout(binding = 5, std140)
 uniform f_light0_block_ubo {
   Light0 inner;
-} v_1;
+} v_2;
 vec4 glFragColor = vec4(0.0f);
 uniform highp sampler2D TextureSamplerTexture_TextureSamplerSampler;
 uniform highp sampler2D TextureSampler1Texture_TextureSampler1Sampler;
@@ -60,7 +60,7 @@
 layout(location = 0) in vec4 tint_interstage_location0;
 layout(location = 3) in vec2 tint_interstage_location3;
 layout(location = 2) in vec4 tint_interstage_location2;
-layout(location = 0) out vec4 tint_symbol_1_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 mat3 cotangent_frame_vf3_vf3_vf2_vf2_(inout vec3 normal_1, inout vec3 p, inout vec2 uv, inout vec2 tangentSpaceParams) {
   vec3 dp1 = vec3(0.0f);
   vec3 dp2 = vec3(0.0f);
@@ -113,9 +113,9 @@
   float x_193 = invmax;
   vec3 x_194 = (x_192 * x_193);
   vec3 x_195 = normal_1;
-  vec3 v_2 = vec3(x_191.x, x_191.y, x_191.z);
-  vec3 v_3 = vec3(x_194.x, x_194.y, x_194.z);
-  return mat3(v_2, v_3, vec3(x_195.x, x_195.y, x_195.z));
+  vec3 v_3 = vec3(x_191.x, x_191.y, x_191.z);
+  vec3 v_4 = vec3(x_194.x, x_194.y, x_194.z);
+  return mat3(v_3, v_4, vec3(x_195.x, x_195.y, x_195.z));
 }
 mat3 transposeMat3_mf33_(inout mat3 inMatrix) {
   vec3 i0 = vec3(0.0f);
@@ -140,9 +140,9 @@
   float x_91 = i1.z;
   float x_93 = i2.z;
   vec3 x_94 = vec3(x_89, x_91, x_93);
-  vec3 v_4 = vec3(x_78.x, x_78.y, x_78.z);
-  vec3 v_5 = vec3(x_86.x, x_86.y, x_86.z);
-  outMatrix = mat3(v_4, v_5, vec3(x_94.x, x_94.y, x_94.z));
+  vec3 v_5 = vec3(x_78.x, x_78.y, x_78.z);
+  vec3 v_6 = vec3(x_86.x, x_86.y, x_86.z);
+  outMatrix = mat3(v_5, v_6, vec3(x_94.x, x_94.y, x_94.z));
   mat3 x_110 = outMatrix;
   return x_110;
 }
@@ -260,7 +260,7 @@
   uvOffset = vec2(0.0f);
   float x_292 = v.inner.u_bumpStrength;
   normalScale = (1.0f / x_292);
-  bool x_298 = tint_symbol;
+  bool x_298 = v_1;
   if (x_298) {
     vec2 x_303 = v_uv;
     x_299 = x_303;
@@ -410,13 +410,13 @@
   param_11 = x_501;
   vec3 x_503 = normalW;
   param_12 = x_503;
-  vec4 x_507 = v_1.inner.vLightData;
+  vec4 x_507 = v_2.inner.vLightData;
   param_13 = x_507;
-  vec4 x_510 = v_1.inner.vLightDiffuse;
+  vec4 x_510 = v_2.inner.vLightDiffuse;
   param_14 = vec3(x_510.x, x_510.y, x_510.z);
-  vec4 x_514 = v_1.inner.vLightSpecular;
+  vec4 x_514 = v_2.inner.vLightSpecular;
   param_15 = vec3(x_514.x, x_514.y, x_514.z);
-  vec3 x_518 = v_1.inner.vLightGround;
+  vec3 x_518 = v_2.inner.vLightGround;
   param_16 = x_518;
   float x_520 = glossiness_1;
   param_17 = x_520;
@@ -443,15 +443,15 @@
   vec3 x_548 = output3;
   glFragColor = vec4(x_548.x, x_548.y, x_548.z, 1.0f);
 }
-main_out tint_symbol_1_inner(vec2 vMainuv_param, vec4 v_output1_param, bool tint_symbol_2, vec2 v_uv_param, vec4 v_output2_param) {
+main_out main_inner(vec2 vMainuv_param, vec4 v_output1_param, bool v_7, vec2 v_uv_param, vec4 v_output2_param) {
   vMainuv = vMainuv_param;
   v_output1 = v_output1_param;
-  tint_symbol = tint_symbol_2;
+  v_1 = v_7;
   v_uv = v_uv_param;
   v_output2 = v_output2_param;
   main_1();
   return main_out(glFragColor);
 }
 void main() {
-  tint_symbol_1_loc0_Output = tint_symbol_1_inner(tint_interstage_location1, tint_interstage_location0, gl_FrontFacing, tint_interstage_location3, tint_interstage_location2).glFragColor_1;
+  main_loc0_Output = main_inner(tint_interstage_location1, tint_interstage_location0, gl_FrontFacing, tint_interstage_location3, tint_interstage_location2).glFragColor_1;
 }
diff --git a/test/tint/bug/tint/977.spvasm.expected.glsl b/test/tint/bug/tint/977.spvasm.expected.glsl
index fbec1f7..b9e15e8 100644
--- a/test/tint/bug/tint/977.spvasm.expected.glsl
+++ b/test/tint/bug/tint/977.spvasm.expected.glsl
@@ -1,6 +1,6 @@
 #version 310 es
 
-uvec3 tint_symbol = uvec3(0u);
+uvec3 v = uvec3(0u);
 layout(binding = 2, std430)
 buffer ResultMatrix_1_ssbo {
   float numbers[];
@@ -24,21 +24,21 @@
   int a_1 = 0;
   float param = 0.0f;
   float param_1 = 0.0f;
-  index = int(tint_symbol.x);
+  index = int(v.x);
   a_1 = -10;
   int x_63 = index;
   param = -4.0f;
   param_1 = -3.0f;
   float x_68 = binaryOperation_f1_f1_(param, param_1);
-  uint v = (uint(resultMatrix.numbers.length()) - 1u);
-  uint v_1 = min(uint(x_63), v);
-  resultMatrix.numbers[v_1] = x_68;
+  uint v_1 = (uint(resultMatrix.numbers.length()) - 1u);
+  uint v_2 = min(uint(x_63), v_1);
+  resultMatrix.numbers[v_2] = x_68;
 }
-void tint_symbol_1_inner(uvec3 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
+void main_inner(uvec3 v_3) {
+  v = v_3;
   main_1();
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_1_inner(gl_GlobalInvocationID);
+  main_inner(gl_GlobalInvocationID);
 }
diff --git a/test/tint/bug/tint/978.wgsl.expected.glsl b/test/tint/bug/tint/978.wgsl.expected.glsl
index 4486b76..848f831 100644
--- a/test/tint/bug/tint/978.wgsl.expected.glsl
+++ b/test/tint/bug/tint/978.wgsl.expected.glsl
@@ -13,14 +13,14 @@
 
 uniform highp sampler2DShadow depthMap_texSampler;
 layout(location = 2) in vec2 tint_interstage_location2;
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-FragmentOutput tint_symbol_inner(FragmentInput fIn) {
-  float tint_symbol_1 = texture(depthMap_texSampler, vec3(fIn.vUv, 0.0f));
-  vec3 color = vec3(tint_symbol_1, tint_symbol_1, tint_symbol_1);
+layout(location = 0) out vec4 main_loc0_Output;
+FragmentOutput main_inner(FragmentInput fIn) {
+  float v = texture(depthMap_texSampler, vec3(fIn.vUv, 0.0f));
+  vec3 color = vec3(v, v, v);
   FragmentOutput fOut = FragmentOutput(vec4(0.0f));
   fOut.color = vec4(color, 1.0f);
   return fOut;
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner(FragmentInput(tint_interstage_location2)).color;
+  main_loc0_Output = main_inner(FragmentInput(tint_interstage_location2)).color;
 }
diff --git a/test/tint/bug/tint/980.wgsl.expected.glsl b/test/tint/bug/tint/980.wgsl.expected.glsl
index ee2545c..f359190 100644
--- a/test/tint/bug/tint/980.wgsl.expected.glsl
+++ b/test/tint/bug/tint/980.wgsl.expected.glsl
@@ -15,10 +15,10 @@
   normal[min(index, 2u)] = -(sign(rd[min(index, 2u)]));
   return normalize(normal);
 }
-void tint_symbol_inner(uint idx) {
+void main_inner(uint idx) {
   v_1.inner.v = Bad(v_1.inner.i, v_1.inner.v);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
index 38dfeaf..97f5516 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
@@ -10,7 +10,7 @@
   int arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -25,11 +25,11 @@
   SB_RW_atomic inner;
 } v;
 void atomicCompareExchangeWeak_1bd40a() {
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   int v_1 = atomicCompSwap(v.inner.arg_0, 1, 1);
   int old_value_1 = atomic_compare_exchange_result_i32(v_1, (v_1 == 1)).old_value;
   int x_19 = old_value_1;
-  res = tint_symbol(x_19, (x_19 == 1));
+  res = tint_struct(x_19, (x_19 == 1));
 }
 void fragment_main_1() {
   atomicCompareExchangeWeak_1bd40a();
@@ -47,7 +47,7 @@
   int arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -62,11 +62,11 @@
   SB_RW_atomic inner;
 } v;
 void atomicCompareExchangeWeak_1bd40a() {
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   int v_1 = atomicCompSwap(v.inner.arg_0, 1, 1);
   int old_value_1 = atomic_compare_exchange_result_i32(v_1, (v_1 == 1)).old_value;
   int x_19 = old_value_1;
-  res = tint_symbol(x_19, (x_19 == 1));
+  res = tint_struct(x_19, (x_19 == 1));
 }
 void compute_main_1() {
   atomicCompareExchangeWeak_1bd40a();
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
index 5ab9127..0f569ed 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
@@ -10,7 +10,7 @@
   uint arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -25,11 +25,11 @@
   SB_RW_atomic inner;
 } v;
 void atomicCompareExchangeWeak_63d8e6() {
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   uint v_1 = atomicCompSwap(v.inner.arg_0, 1u, 1u);
   uint old_value_1 = atomic_compare_exchange_result_u32(v_1, (v_1 == 1u)).old_value;
   uint x_17 = old_value_1;
-  res = tint_symbol(x_17, (x_17 == 1u));
+  res = tint_struct(x_17, (x_17 == 1u));
 }
 void fragment_main_1() {
   atomicCompareExchangeWeak_63d8e6();
@@ -47,7 +47,7 @@
   uint arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -62,11 +62,11 @@
   SB_RW_atomic inner;
 } v;
 void atomicCompareExchangeWeak_63d8e6() {
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   uint v_1 = atomicCompSwap(v.inner.arg_0, 1u, 1u);
   uint old_value_1 = atomic_compare_exchange_result_u32(v_1, (v_1 == 1u)).old_value;
   uint x_17 = old_value_1;
-  res = tint_symbol(x_17, (x_17 == 1u));
+  res = tint_struct(x_17, (x_17 == 1u));
 }
 void compute_main_1() {
   atomicCompareExchangeWeak_63d8e6();
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
index 820efd7..83376ed 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -14,11 +14,11 @@
 uint local_invocation_index_1 = 0u;
 shared int arg_0;
 void atomicCompareExchangeWeak_e88938() {
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   int v = atomicCompSwap(arg_0, 1, 1);
   int old_value_1 = atomic_compare_exchange_result_i32(v, (v == 1)).old_value;
   int x_18 = old_value_1;
-  res = tint_symbol(x_18, (x_18 == 1));
+  res = tint_struct(x_18, (x_18 == 1));
 }
 void compute_main_inner(uint local_invocation_index_2) {
   atomicExchange(arg_0, 0);
diff --git a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
index 995f311..a7d5a6a 100644
--- a/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/literal/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -14,11 +14,11 @@
 uint local_invocation_index_1 = 0u;
 shared uint arg_0;
 void atomicCompareExchangeWeak_83580d() {
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   uint v = atomicCompSwap(arg_0, 1u, 1u);
   uint old_value_1 = atomic_compare_exchange_result_u32(v, (v == 1u)).old_value;
   uint x_17 = old_value_1;
-  res = tint_symbol(x_17, (x_17 == 1u));
+  res = tint_struct(x_17, (x_17 == 1u));
 }
 void compute_main_inner(uint local_invocation_index_2) {
   atomicExchange(arg_0, 0u);
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
index a92b213..31acd63 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_i32.spvasm.expected.glsl
@@ -10,7 +10,7 @@
   int arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -27,7 +27,7 @@
 void atomicCompareExchangeWeak_1bd40a() {
   int arg_1 = 0;
   int arg_2 = 0;
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   arg_1 = 1;
   arg_2 = 1;
   int x_23 = arg_2;
@@ -35,7 +35,7 @@
   int v_1 = atomicCompSwap(v.inner.arg_0, x_24, x_23);
   int old_value_1 = atomic_compare_exchange_result_i32(v_1, (v_1 == x_24)).old_value;
   int x_25 = old_value_1;
-  res = tint_symbol(x_25, (x_25 == x_23));
+  res = tint_struct(x_25, (x_25 == x_23));
 }
 void fragment_main_1() {
   atomicCompareExchangeWeak_1bd40a();
@@ -53,7 +53,7 @@
   int arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -70,7 +70,7 @@
 void atomicCompareExchangeWeak_1bd40a() {
   int arg_1 = 0;
   int arg_2 = 0;
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   arg_1 = 1;
   arg_2 = 1;
   int x_23 = arg_2;
@@ -78,7 +78,7 @@
   int v_1 = atomicCompSwap(v.inner.arg_0, x_24, x_23);
   int old_value_1 = atomic_compare_exchange_result_i32(v_1, (v_1 == x_24)).old_value;
   int x_25 = old_value_1;
-  res = tint_symbol(x_25, (x_25 == x_23));
+  res = tint_struct(x_25, (x_25 == x_23));
 }
 void compute_main_1() {
   atomicCompareExchangeWeak_1bd40a();
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
index 449def3..8eb693e 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/storage_u32.spvasm.expected.glsl
@@ -10,7 +10,7 @@
   uint arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -27,7 +27,7 @@
 void atomicCompareExchangeWeak_63d8e6() {
   uint arg_1 = 0u;
   uint arg_2 = 0u;
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   arg_1 = 1u;
   arg_2 = 1u;
   uint x_21 = arg_2;
@@ -35,7 +35,7 @@
   uint v_1 = atomicCompSwap(v.inner.arg_0, x_22, x_21);
   uint old_value_1 = atomic_compare_exchange_result_u32(v_1, (v_1 == x_22)).old_value;
   uint x_23 = old_value_1;
-  res = tint_symbol(x_23, (x_23 == x_21));
+  res = tint_struct(x_23, (x_23 == x_21));
 }
 void fragment_main_1() {
   atomicCompareExchangeWeak_63d8e6();
@@ -53,7 +53,7 @@
   uint arg_0;
 };
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -70,7 +70,7 @@
 void atomicCompareExchangeWeak_63d8e6() {
   uint arg_1 = 0u;
   uint arg_2 = 0u;
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   arg_1 = 1u;
   arg_2 = 1u;
   uint x_21 = arg_2;
@@ -78,7 +78,7 @@
   uint v_1 = atomicCompSwap(v.inner.arg_0, x_22, x_21);
   uint old_value_1 = atomic_compare_exchange_result_u32(v_1, (v_1 == x_22)).old_value;
   uint x_23 = old_value_1;
-  res = tint_symbol(x_23, (x_23 == x_21));
+  res = tint_struct(x_23, (x_23 == x_21));
 }
 void compute_main_1() {
   atomicCompareExchangeWeak_63d8e6();
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
index 5cb4c5e..9e36032 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_i32.spvasm.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 
-struct tint_symbol {
+struct tint_struct {
   int old_value;
   bool exchanged;
 };
@@ -16,7 +16,7 @@
 void atomicCompareExchangeWeak_e88938() {
   int arg_1 = 0;
   int arg_2 = 0;
-  tint_symbol res = tint_symbol(0, false);
+  tint_struct res = tint_struct(0, false);
   arg_1 = 1;
   arg_2 = 1;
   int x_22 = arg_2;
@@ -24,7 +24,7 @@
   int v = atomicCompSwap(arg_0, x_23, x_22);
   int old_value_1 = atomic_compare_exchange_result_i32(v, (v == x_23)).old_value;
   int x_24 = old_value_1;
-  res = tint_symbol(x_24, (x_24 == x_22));
+  res = tint_struct(x_24, (x_24 == x_22));
 }
 void compute_main_inner(uint local_invocation_index_2) {
   atomicExchange(arg_0, 0);
diff --git a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
index 359f8ab..5eac447 100644
--- a/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
+++ b/test/tint/builtins/atomics/from_gen/var/atomicCompareExchangeWeak/workgroup_u32.spvasm.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 
-struct tint_symbol {
+struct tint_struct {
   uint old_value;
   bool exchanged;
 };
@@ -16,7 +16,7 @@
 void atomicCompareExchangeWeak_83580d() {
   uint arg_1 = 0u;
   uint arg_2 = 0u;
-  tint_symbol res = tint_symbol(0u, false);
+  tint_struct res = tint_struct(0u, false);
   arg_1 = 1u;
   arg_2 = 1u;
   uint x_21 = arg_2;
@@ -24,7 +24,7 @@
   uint v = atomicCompSwap(arg_0, x_22, x_21);
   uint old_value_1 = atomic_compare_exchange_result_u32(v, (v == x_22)).old_value;
   uint x_23 = old_value_1;
-  res = tint_symbol(x_23, (x_23 == x_21));
+  res = tint_struct(x_23, (x_23 == x_21));
 }
 void compute_main_inner(uint local_invocation_index_2) {
   atomicExchange(arg_0, 0u);
diff --git a/test/tint/builtins/frexp.wgsl.expected.glsl b/test/tint/builtins/frexp.wgsl.expected.glsl
index 25e9344..72cca03 100644
--- a/test/tint/builtins/frexp.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp.wgsl.expected.glsl
@@ -2,13 +2,13 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   frexp_result_f32 res = frexp_result_f32(0.61500000953674316406f, 1);
-  int tint_symbol_1 = res.exp;
-  float tint_symbol_2 = res.fract;
+  int v = res.member_1;
+  float v_1 = res.member_0;
 }
diff --git a/test/tint/builtins/frexp/scalar/const.wgsl.expected.glsl b/test/tint/builtins/frexp/scalar/const.wgsl.expected.glsl
index 0f958a8..1f99341 100644
--- a/test/tint/builtins/frexp/scalar/const.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/scalar/const.wgsl.expected.glsl
@@ -2,13 +2,13 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   frexp_result_f32 res = frexp_result_f32(0.625f, 1);
-  float tint_symbol_2 = res.fract;
-  int tint_symbol_3 = res.exp;
+  float v = res.member_0;
+  int v_1 = res.member_1;
 }
diff --git a/test/tint/builtins/frexp/scalar/const_members.wgsl.expected.glsl b/test/tint/builtins/frexp/scalar/const_members.wgsl.expected.glsl
index 4f9b63d..bc7f25e 100644
--- a/test/tint/builtins/frexp/scalar/const_members.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/scalar/const_members.wgsl.expected.glsl
@@ -2,6 +2,6 @@
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  float tint_symbol_2 = 0.625f;
-  int tint_symbol_3 = 1;
+  float v = 0.625f;
+  int v_1 = 1;
 }
diff --git a/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.glsl b/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.glsl
index cebdbd7..b85596b 100644
--- a/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/scalar/mixed.wgsl.expected.glsl
@@ -2,8 +2,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -11,9 +11,9 @@
   float runtime_in = 1.25f;
   frexp_result_f32 res = frexp_result_f32(0.625f, 1);
   frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(runtime_in, v.exp);
+  v.member_0 = frexp(runtime_in, v.member_1);
   res = v;
   res = frexp_result_f32(0.625f, 1);
-  float tint_symbol_1 = res.fract;
-  int tint_symbol_2 = res.exp;
+  float v_1 = res.member_0;
+  int v_2 = res.member_1;
 }
diff --git a/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.glsl b/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.glsl
index ee00b47..fe65ba5 100644
--- a/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/scalar/runtime.wgsl.expected.glsl
@@ -2,16 +2,16 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  float tint_symbol_1 = 1.25f;
-  frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(tint_symbol_1, v.exp);
-  frexp_result_f32 res = v;
-  float tint_symbol_2 = res.fract;
-  int tint_symbol_3 = res.exp;
+  float v = 1.25f;
+  frexp_result_f32 v_1 = frexp_result_f32(0.0f, 0);
+  v_1.member_0 = frexp(v, v_1.member_1);
+  frexp_result_f32 res = v_1;
+  float v_2 = res.member_0;
+  int v_3 = res.member_1;
 }
diff --git a/test/tint/builtins/frexp/vector/const.wgsl.expected.glsl b/test/tint/builtins/frexp/vector/const.wgsl.expected.glsl
index 3ba7374..2ba7cc3 100644
--- a/test/tint/builtins/frexp/vector/const.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/vector/const.wgsl.expected.glsl
@@ -2,13 +2,13 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   frexp_result_vec2_f32 res = frexp_result_vec2_f32(vec2(0.625f, 0.9375f), ivec2(1, 2));
-  vec2 tint_symbol_2 = res.fract;
-  ivec2 tint_symbol_3 = res.exp;
+  vec2 v = res.member_0;
+  ivec2 v_1 = res.member_1;
 }
diff --git a/test/tint/builtins/frexp/vector/const_members.wgsl.expected.glsl b/test/tint/builtins/frexp/vector/const_members.wgsl.expected.glsl
index f8f812f..c961f9e 100644
--- a/test/tint/builtins/frexp/vector/const_members.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/vector/const_members.wgsl.expected.glsl
@@ -2,6 +2,6 @@
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  vec2 tint_symbol_2 = vec2(0.625f, 0.9375f);
-  ivec2 tint_symbol_3 = ivec2(1, 2);
+  vec2 v = vec2(0.625f, 0.9375f);
+  ivec2 v_1 = ivec2(1, 2);
 }
diff --git a/test/tint/builtins/frexp/vector/mixed.wgsl.expected.glsl b/test/tint/builtins/frexp/vector/mixed.wgsl.expected.glsl
index 4474078..71fb778 100644
--- a/test/tint/builtins/frexp/vector/mixed.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/vector/mixed.wgsl.expected.glsl
@@ -2,8 +2,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -11,9 +11,9 @@
   vec2 runtime_in = vec2(1.25f, 3.75f);
   frexp_result_vec2_f32 res = frexp_result_vec2_f32(vec2(0.625f, 0.9375f), ivec2(1, 2));
   frexp_result_vec2_f32 v = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
-  v.fract = frexp(runtime_in, v.exp);
+  v.member_0 = frexp(runtime_in, v.member_1);
   res = v;
   res = frexp_result_vec2_f32(vec2(0.625f, 0.9375f), ivec2(1, 2));
-  vec2 tint_symbol_1 = res.fract;
-  ivec2 tint_symbol_2 = res.exp;
+  vec2 v_1 = res.member_0;
+  ivec2 v_2 = res.member_1;
 }
diff --git a/test/tint/builtins/frexp/vector/runtime.wgsl.expected.glsl b/test/tint/builtins/frexp/vector/runtime.wgsl.expected.glsl
index 67502f5..a44e5ef 100644
--- a/test/tint/builtins/frexp/vector/runtime.wgsl.expected.glsl
+++ b/test/tint/builtins/frexp/vector/runtime.wgsl.expected.glsl
@@ -2,16 +2,16 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  vec2 tint_symbol_1 = vec2(1.25f, 3.75f);
-  frexp_result_vec2_f32 v = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
-  v.fract = frexp(tint_symbol_1, v.exp);
-  frexp_result_vec2_f32 res = v;
-  vec2 tint_symbol_2 = res.fract;
-  ivec2 tint_symbol_3 = res.exp;
+  vec2 v = vec2(1.25f, 3.75f);
+  frexp_result_vec2_f32 v_1 = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
+  v_1.member_0 = frexp(v, v_1.member_1);
+  frexp_result_vec2_f32 res = v_1;
+  vec2 v_2 = res.member_0;
+  ivec2 v_3 = res.member_1;
 }
diff --git a/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl
index 08fd5ab..563907f 100644
--- a/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_002533();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_002533();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl
index cd8936f..8cbed83 100644
--- a/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_005174();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_005174();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl
index f497833..9ae0956 100644
--- a/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_1ce782();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_1ce782();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl
index d343ca0..2b4e4e1 100644
--- a/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_1e9d53();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_1e9d53();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.glsl
index 92941e3..95cb19e 100644
--- a/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/2f861b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_2f861b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.glsl
index 61a5be2..f089d17 100644
--- a/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/421ca3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_421ca3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_421ca3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl
index 44686ca2..266cba6 100644
--- a/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_467cd1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_467cd1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl
index ea4af94..565297c 100644
--- a/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_4ad288();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_4ad288();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.glsl
index a55d787..1c3b9a9 100644
--- a/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/538d29.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_538d29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_538d29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.glsl
index 869bcff..6edfbd6 100644
--- a/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/577d6e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_577d6e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.glsl
index fccdf1d..e37093e 100644
--- a/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/5a8af1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_5a8af1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl
index b60352e..d908559 100644
--- a/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_5ad50a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_5ad50a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.glsl
index 5fff6aa..df0610d 100644
--- a/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/5ae4fe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_5ae4fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_5ae4fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl
index 2a961cf..ef42b40 100644
--- a/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7326de();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7326de();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl
index 010fed6..1a321b0 100644
--- a/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7f28e6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7f28e6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl
index 1341628..3a84d07 100644
--- a/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7faa9e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7faa9e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.glsl
index a462dd6..84087ab 100644
--- a/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/82ff9d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_82ff9d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.glsl
index ed19bac..ed21bf2 100644
--- a/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/8ca9b1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_8ca9b1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl
index ac5b7b1..88cd98a 100644
--- a/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_9c80a6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_9c80a6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.glsl
index 7a65d35..1b8a711 100644
--- a/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/aedb6d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_aedb6d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl
index 51ccc11..a1d7ddc 100644
--- a/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_b96037();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_b96037();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.glsl
index 69d18dd..4565a53 100644
--- a/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/c3321c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_c3321c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.glsl
index f2bd90d..65cfbe1 100644
--- a/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/e28785.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_e28785();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.glsl
index 6abfb3c..00f368d 100644
--- a/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/abs/fd247f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_fd247f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_fd247f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.glsl
index d8a5b1c..6cfe5ad 100644
--- a/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/004aff.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_004aff();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_004aff();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.glsl
index d63e9a2..ae83ee8 100644
--- a/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/069188.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_069188();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.glsl
index 37f7892..fa39269 100644
--- a/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/15d35b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_15d35b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.glsl
index 7df8886..21f8415 100644
--- a/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/203628.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_203628();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_203628();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.glsl
index a3919e1..9db71aa 100644
--- a/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/303e3d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_303e3d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_303e3d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl
index b2b2723..2cdd062 100644
--- a/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_489247();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_489247();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.glsl
index bfdf5ef..ac7466d9 100644
--- a/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/4dac75.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_4dac75();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.glsl
index e155950..87e230c 100644
--- a/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/5e9ad2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.25f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_5e9ad2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl
index cfe20e6..0f77c98 100644
--- a/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_8e2acf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_8e2acf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl
index 8d604a6..89ed97a 100644
--- a/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_a610c4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_a610c4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl
index ab7050e..d34f432 100644
--- a/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_dfc915();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_dfc915();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.glsl
index 6820898..3fc5188 100644
--- a/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acos/f47057.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_f47057();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_f47057();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.glsl
index 05c7ded..266e86d 100644
--- a/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/17260e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_17260e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.glsl
index 90f1e4f..ab9673c 100644
--- a/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/3433e8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_3433e8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.glsl
index 0978c4e..8178520 100644
--- a/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/490aae.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_490aae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.glsl
index 2ecb335..42dce68 100644
--- a/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/5f49d8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_5f49d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_5f49d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.glsl
index f02da93..e204de0 100644
--- a/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/640883.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_640883();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_640883();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.glsl
index a7ec951..ecb32d9 100644
--- a/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/9f213e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_9f213e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.glsl
index db545fe..313ce7b 100644
--- a/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/a37dfe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_a37dfe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_a37dfe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.glsl
index 007537a..19b4b8e 100644
--- a/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/d51ccb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_d51ccb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_d51ccb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.glsl
index b4257aa..b744830 100644
--- a/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/de60d8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_de60d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_de60d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.glsl
index 5433470..ba443be 100644
--- a/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/e38f5c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_e38f5c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_e38f5c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.glsl
index 4f5ad5a..b046294 100644
--- a/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/ecf2d1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_ecf2d1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_ecf2d1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.glsl
index c52da81..e2e2824 100644
--- a/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/acosh/f56574.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_f56574();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_f56574();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl
index 8d546a6..af5ebdb 100644
--- a/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_353d6a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_353d6a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl
index 34040fa..2684524 100644
--- a/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_986c7b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_986c7b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl
index bcff8b2..76093d0 100644
--- a/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_bd2dba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_bd2dba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl
index ea584a3..328c841 100644
--- a/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_f46790();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_f46790();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl
index 17c53d2..c282402 100644
--- a/test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_083428();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_083428();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl
index 6416e07..6e70e63 100644
--- a/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_0e3e58();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_0e3e58();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl
index ab60f20..23b371d 100644
--- a/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_2ab91a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_2ab91a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl
index 951f14a..d751cb2 100644
--- a/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_e755c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_e755c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl
index 322fcba..f0553aa 100644
--- a/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_1588cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_1588cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl
index e56ddb0..41d9b6796 100644
--- a/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/8421b9.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_8421b9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_8421b9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl
index 0c39a0e..6fc6d9b 100644
--- a/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_a0f5ca();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_a0f5ca();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl
index d0cbdba..5974939 100644
--- a/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_cfca0a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_cfca0a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl
index 5b58024..397dc74 100644
--- a/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_064953();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_064953();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.glsl
index 7fa7829..dbefb42 100644
--- a/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/0bac07.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_0bac07();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.glsl
index ef5566d..0aa2c93 100644
--- a/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/11dfda.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_11dfda();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_11dfda();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.glsl
index adfd694..abf2d27 100644
--- a/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/2d8e29.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_2d8e29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_2d8e29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.glsl
index 9ac08f1..3661813 100644
--- a/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/3cfbd4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_3cfbd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_3cfbd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.glsl
index 2dfee4c..1b8aa32 100644
--- a/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/64bb1f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_64bb1f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl
index 8fbf90c..e4b9256 100644
--- a/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_7b6a44();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_7b6a44();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl
index cc9babf..0c456b7 100644
--- a/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_8cd9c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_8cd9c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.glsl
index 728682e..5ff6db8 100644
--- a/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/a5dd88.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_a5dd88();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.glsl
index 905705a..19c1935 100644
--- a/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/a6d73a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.5f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_a6d73a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.glsl
index 7df123e..0b68b4b 100644
--- a/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/b4aced.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_b4aced();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_b4aced();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl
index 082f348..e28b86a 100644
--- a/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_c0c272();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_c0c272();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.glsl
index a067d8d..ba4a1ec 100644
--- a/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/157447.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_157447();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_157447();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.glsl
index 5af25cc..1748f74 100644
--- a/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/16b543.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_16b543();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.glsl
index c6c7a81..9a79e34 100644
--- a/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/180015.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.88137358427047729492f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_180015();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.glsl
index a4bdb51..fdcbb62 100644
--- a/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/2265ee.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_2265ee();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_2265ee();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.glsl
index 42a1945..d0d05ad 100644
--- a/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/468a48.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_468a48();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_468a48();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.glsl
index b3275f1..83af016 100644
--- a/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/4a2226.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_4a2226();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_4a2226();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.glsl
index 62e13f9..4962152 100644
--- a/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/51079e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_51079e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.glsl
index 6afc83e..b7a96a3 100644
--- a/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/8d2e51.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_8d2e51();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_8d2e51();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.glsl
index 3c7d243..64d7362 100644
--- a/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/95ab2b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_95ab2b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_95ab2b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.glsl
index 46a9296..d6c5708 100644
--- a/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/ad8f8b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_ad8f8b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_ad8f8b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.glsl
index 0a3bc89..4ba6a40 100644
--- a/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/cf8603.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_cf8603();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.glsl
index d834d04..9e19c92 100644
--- a/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/asinh/fb5e8c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_fb5e8c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_fb5e8c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl
index bd0dddd..ced408a 100644
--- a/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_02979a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_02979a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.glsl
index 7ae63de..9aa0c9c 100644
--- a/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/19faea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_19faea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_19faea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.glsl
index f106469..a8e5376 100644
--- a/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/1e1764.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_1e1764();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_1e1764();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl
index 9541258..beb5ef9 100644
--- a/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_331e6d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_331e6d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.glsl
index c6e8c0f..1b4a8fe 100644
--- a/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/5ca7b8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_5ca7b8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.glsl
index 11006e5..4736d65 100644
--- a/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/749e1b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_749e1b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.glsl
index 6b5f150..af0a84a 100644
--- a/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/7a2a75.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.78539818525314331055f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_7a2a75();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.glsl
index d39a27e..7b37be6 100644
--- a/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/a5f421.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a5f421();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a5f421();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.glsl
index 78eb60a..d0d08da 100644
--- a/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/a7ba61.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a7ba61();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a7ba61();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl
index 913ce72..67c427d 100644
--- a/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a8b696();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a8b696();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl
index bf30324..bd7d595 100644
--- a/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_ad96e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_ad96e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.glsl
index 769e41c..122f997 100644
--- a/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan/d17fb2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_d17fb2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.glsl
index d8ed5fd..9fff4d5 100644
--- a/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/034ace.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.78539818525314331055f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_034ace();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.glsl
index 8491fac..b0c3dff 100644
--- a/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/21dfea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_21dfea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_21dfea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.glsl
index 1a42bc5..ed26293 100644
--- a/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/3c2865.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_3c2865();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl
index 37062a1..267630b 100644
--- a/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_57fb13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_57fb13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.glsl
index 011513e..93734f4 100644
--- a/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/93febc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_93febc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_93febc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl
index 4419d8a..ffe4bbe 100644
--- a/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_96057c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_96057c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl
index c37f5ff..c57e33f 100644
--- a/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_a70d0d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_a70d0d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl
index f346425..d6bf71d 100644
--- a/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_ae713e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_ae713e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.glsl
index 0e26f6f..cd5ce41 100644
--- a/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/c19683.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_c19683();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.glsl
index 14a3c6c..8f5f5f9 100644
--- a/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/c4be45.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_c4be45();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.glsl
index fed27df..e28d4d4 100644
--- a/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/ca698e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_ca698e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_ca698e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.glsl
index e1c159b..c5c3998 100644
--- a/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atan2/d983ab.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_d983ab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_d983ab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.glsl
index c6ec9b8..9319f84 100644
--- a/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/440cca.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_440cca();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_440cca();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.glsl
index 9b87d7d..945d89d 100644
--- a/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/5bf88d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_5bf88d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_5bf88d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.glsl
index ae88c3a..50312a5 100644
--- a/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/70d5bd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_70d5bd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.glsl
index 2b1aac9..70bf099 100644
--- a/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/7997d8.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_7997d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_7997d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.glsl
index ca85cd2..efd1d1c 100644
--- a/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/7f2874.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_7f2874();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.glsl
index 096c87b..fb24485 100644
--- a/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/c0e634.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_c0e634();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_c0e634();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.glsl
index 4d8e3ed..99f8279 100644
--- a/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/c5dc32.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.54930615425109863281f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_c5dc32();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.glsl
index ecf7ae9..407bea0 100644
--- a/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/d2d8cd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_d2d8cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_d2d8cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.glsl
index f796b79..2ce4a4e 100644
--- a/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/e3b450.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_e3b450();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_e3b450();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.glsl
index 72f13c6..0e02afa 100644
--- a/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/e431bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_e431bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.glsl
index a55c68c..c9546b1 100644
--- a/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/ec4b06.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_ec4b06();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_ec4b06();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.glsl
index 51105f1..c87b23b 100644
--- a/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/atanh/f3e01b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_f3e01b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_f3e01b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.glsl
index ed42dc8..5062781 100644
--- a/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/0fe0c9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_0fe0c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_0fe0c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.glsl
index 648ee32..9296469 100644
--- a/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/160c09.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_160c09();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_160c09();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.glsl
index bf9631e..2d12123 100644
--- a/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/16cba4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_16cba4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_16cba4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.glsl
index 3869ead..40ece3d 100644
--- a/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/1c3b31.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_1c3b31();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_1c3b31();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.glsl
index 0f0eb63..38a68d8 100644
--- a/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/1df11f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_1df11f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_1df11f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.glsl
index 960ef10..b9e5648 100644
--- a/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/214f23.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_214f23();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_214f23();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.glsl
index 5399131..979b5b9 100644
--- a/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/23c8bd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_23c8bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_23c8bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.glsl
index 35df172..a48aa68 100644
--- a/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/2421c8.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2421c8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2421c8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.glsl
index bc64500..a9404ee 100644
--- a/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/287bdf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_287bdf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_287bdf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.glsl
index 2224fb2..0ae9120 100644
--- a/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/2a6e58.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2a6e58();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2a6e58();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.glsl
index 3cea18b..509da49 100644
--- a/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/2b05b3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2b05b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2b05b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.glsl
index ba12363..c09acec 100644
--- a/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/2b2738.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2b2738();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2b2738();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.glsl
index 2470997..86f7543 100644
--- a/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/31c080.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_31c080();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_31c080();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.glsl
index b419160..27cde49 100644
--- a/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/332f78.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_332f78();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_332f78();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.glsl
index 9ce68dc..fbfd7af 100644
--- a/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/3e7b47.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3e7b47();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3e7b47();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.glsl
index a73619a..c7dc377 100644
--- a/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/3f7437.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3f7437();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3f7437();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.glsl
index c4b5b28..ce80d6e 100644
--- a/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/3fdacd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3fdacd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3fdacd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.glsl
index 3de7e75..4dfe08e 100644
--- a/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/429d64.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_429d64();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_429d64();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.glsl
index 33c9289..c2f620a 100644
--- a/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/436211.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_436211();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_436211();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.glsl
index 3d023db..b320ac9 100644
--- a/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/5081ed.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_5081ed();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_5081ed();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.glsl
index c9eccf5..652a8e3 100644
--- a/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/56266e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_56266e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_56266e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.glsl
index e481e4b..3428397 100644
--- a/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/66e93d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_66e93d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_66e93d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.glsl
index f63b99d..f6d7350 100644
--- a/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/674557.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_674557();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_674557();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.glsl
index d5adbca..01051b5 100644
--- a/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/6ac6f9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_6ac6f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_6ac6f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.glsl
index 074c999..cd8c7b3 100644
--- a/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/6de2bd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_6de2bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_6de2bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.glsl
index 47f3741..26fcad6 100644
--- a/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/70b121.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_70b121();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_70b121();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.glsl
index 47f6787..b734564 100644
--- a/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/71c92a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_71c92a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_71c92a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.glsl
index 310165f..6787f40 100644
--- a/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/745b27.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_745b27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_745b27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.glsl
index 0d81954..17ea34c 100644
--- a/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/7e67cc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_7e67cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_7e67cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.glsl
index e0b7ab5..558bfba 100644
--- a/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/7ffa9c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_7ffa9c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_7ffa9c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.glsl
index 0c197bf..fd087b3 100644
--- a/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/81c5f5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_81c5f5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_81c5f5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.glsl
index f8a61f1..4894b45 100644
--- a/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/8318a8.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_8318a8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_8318a8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.glsl
index 1bcc5a7..2344a8a 100644
--- a/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/879dc9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_879dc9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_879dc9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.glsl
index 4df6c90..e466e01 100644
--- a/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/899e50.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_899e50();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_899e50();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.glsl
index 1c6a7c2..9a39e46 100644
--- a/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/8d184c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_8d184c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_8d184c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.glsl
index e0f05a8..69b29f8 100644
--- a/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/9bcf71.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9bcf71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9bcf71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.glsl
index 5fc2ef0..75653f2 100644
--- a/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/9ca42c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9ca42c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9ca42c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.glsl
index 259e0a1..c9adc07 100644
--- a/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/9eee21.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9eee21();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9eee21();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.glsl
index 53c9f09..56b5410 100644
--- a/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/a4b290.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a4b290();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a4b290();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.glsl
index 3eba62c..d64e916 100644
--- a/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/a58b50.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a58b50();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a58b50();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.glsl
index 41ac09b..085053f 100644
--- a/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/a5c539.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a5c539();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a5c539();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.glsl
index 2429ddf..2673bc7 100644
--- a/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/a8c93f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a8c93f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a8c93f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.glsl
index 656732a..93cab2d 100644
--- a/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/a8ea1b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a8ea1b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a8ea1b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.glsl
index 12a6cc5..9a783fb 100644
--- a/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/ac09d0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ac09d0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ac09d0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.glsl
index 35f9557..e95a455 100644
--- a/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/ad4b05.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ad4b05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ad4b05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.glsl
index c9be4cb..3bba776 100644
--- a/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/b28cbd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_b28cbd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_b28cbd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.glsl
index f7fa056..89e6c6c 100644
--- a/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/b77573.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_b77573();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_b77573();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.glsl
index fe6ba61..4782357 100644
--- a/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/bc3994.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_bc3994();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_bc3994();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.glsl
index fb50ae8..a4c5725 100644
--- a/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/c69aaf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_c69aaf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_c69aaf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.glsl
index 3eac0a2..752d54d 100644
--- a/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/ca5c3f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ca5c3f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ca5c3f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.glsl
index 58b906a..3ca9621 100644
--- a/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/cc7aa7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_cc7aa7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_cc7aa7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.glsl
index 9244cc4..b2a5c21 100644
--- a/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/d29765.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_d29765();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_d29765();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.glsl
index d538459..079004e 100644
--- a/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/dce842.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_dce842();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_dce842();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.glsl
index 107c8e5..80a840e 100644
--- a/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/e61c57.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_e61c57();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_e61c57();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.glsl
index cce91d0..923cea5 100644
--- a/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/e6c18f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_e6c18f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_e6c18f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.glsl
index d63e957..0bf58fa 100644
--- a/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/bitcast/f756cd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_f756cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_f756cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.glsl
index b2f56c0..3424aaa 100644
--- a/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/09bf52.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_09bf52();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_09bf52();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.glsl
index 0335b24..f937663 100644
--- a/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/11b1dc.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_11b1dc();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.glsl
index 86d06e0..8da502f3 100644
--- a/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/18c240.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_18c240();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_18c240();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.glsl
index 7d48d01..77efe8a 100644
--- a/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/32c946.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_32c946();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl
index 73894dc..6cfa281 100644
--- a/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_34064b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_34064b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.glsl
index a8e27d2..f1a504e 100644
--- a/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/4bca2a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_4bca2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_4bca2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl
index fe69e64..1eb7c7c 100644
--- a/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_678655();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_678655();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl
index 26be4f2..07ac2c4 100644
--- a/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_96f597();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_96f597();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl
index 2b3ac08..2e0fcfb 100644
--- a/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_b74c16();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_b74c16();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.glsl
index 23b646d..627fc19 100644
--- a/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/bb2ca2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_bb2ca2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.glsl
index 4738747..1a83959 100644
--- a/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/e0b70a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_e0b70a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.glsl
index 01fb3ae..2205c56 100644
--- a/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ceil/f3f889.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_f3f889();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_f3f889();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl
index 4e356e4..46c2ada 100644
--- a/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_0acf8f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_0acf8f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.glsl
index f34d6b3..3c64c54 100644
--- a/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/177548.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_177548();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl
index 3d88045..e53070a 100644
--- a/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_1a32e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_1a32e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.glsl
index 4ee9d4b..5e3aa2a 100644
--- a/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/235b29.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_235b29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_235b29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.glsl
index 1935b7a..cf9b8b5 100644
--- a/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/23aa4f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_23aa4f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl
index bfa064e..d5af42f 100644
--- a/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2bd567();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2bd567();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl
index e1ddfaa..8b69852 100644
--- a/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2bde41();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2bde41();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.glsl
index 6226111..213c7ab 100644
--- a/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/2c251b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2c251b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2c251b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl
index d90460e..6905354 100644
--- a/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_548fc7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_548fc7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.glsl
index f552b94..5f85821 100644
--- a/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/553ffb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_553ffb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_553ffb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.glsl
index dc382c84..778f4ef 100644
--- a/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/5cf700.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_5cf700();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl
index 7ab5aac..9e771eb 100644
--- a/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_5f0819();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_5f0819();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl
index 3a8c82e..49f75d6 100644
--- a/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_6c1749();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_6c1749();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl
index 8aa0fa4..97548b8 100644
--- a/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_7706d7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_7706d7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl
index 054b16f..f66b7cf 100644
--- a/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_867397();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_867397();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.glsl
index d936821..03b22d1 100644
--- a/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/87df46.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_87df46();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.glsl
index 5bb38f9..b010ace 100644
--- a/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/8b1eaa.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_8b1eaa();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.glsl
index 028c3b1..ea6603e 100644
--- a/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/96e56a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_96e56a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.glsl
index 548a4a6..519e4ee 100644
--- a/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/9d731c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_9d731c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl
index dd4d9eb..90a49f6 100644
--- a/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_a2de25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_a2de25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl
index bbcac51..d10c242 100644
--- a/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_b07c65();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_b07c65();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.glsl
index 512ae0e..3a8cebd 100644
--- a/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/b195eb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_b195eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_b195eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl
index 92935f9..e85fed9 100644
--- a/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_bd43ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_bd43ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.glsl
index 86108fe..57c09dd 100644
--- a/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/clamp/d396af.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_d396af();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.glsl
index d764574..7526fbf 100644
--- a/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/0835a8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_0835a8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_0835a8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.glsl
index 7365dc3..b5482f4 100644
--- a/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/0a89f7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_0a89f7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_0a89f7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl
index f8c4190..e1628be 100644
--- a/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_16dc15();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_16dc15();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl
index a81872d..5c4e64f 100644
--- a/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_29d66d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_29d66d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.glsl
index cf6fb1f..ffee1d4 100644
--- a/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/47d768.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_47d768();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.glsl
index b2e3a72..21ea8a1 100644
--- a/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/5bc2c6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_5bc2c6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_5bc2c6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.glsl
index cf9bbb1..1dcabb1 100644
--- a/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/6b1fdf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_6b1fdf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.glsl
index e890f34..57357e3 100644
--- a/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/a297d4.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_a297d4();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.glsl
index 39524af..4ac07e7 100644
--- a/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/af7447.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_af7447();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl
index 4306ce5..a32f702 100644
--- a/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_c3b486();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_c3b486();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl
index d5f18a5..29faaf2 100644
--- a/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_c5c28e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_c5c28e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.glsl
index 36ffbb0..e582419 100644
--- a/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cos/fc047d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_fc047d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_fc047d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.glsl
index cba6a0f..79d5f71 100644
--- a/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/2ed778.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_2ed778();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_2ed778();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl
index f2443eb..9931f8b 100644
--- a/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_377652();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_377652();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.glsl
index 20de569..14b3a38 100644
--- a/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/3b7bbf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_3b7bbf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_3b7bbf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.glsl
index 88690a8..79845da 100644
--- a/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/432645.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_432645();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.glsl
index 0553878..c65ab07 100644
--- a/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/43b672.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_43b672();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_43b672();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.glsl
index feb0922..eeae949 100644
--- a/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/b1b8a0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_b1b8a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_b1b8a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl
index 418f94a..8ecef4f1 100644
--- a/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_c13756();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_c13756();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.glsl
index 33fc34c..7c1877d 100644
--- a/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/c892bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_c892bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.glsl
index 2575d29..bf77d9b 100644
--- a/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/d8dee7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_d8dee7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl
index 82cbdc4..fd4bd37 100644
--- a/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_da92dd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_da92dd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl
index 40bf37c..c85f374 100644
--- a/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_e0c1de();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_e0c1de();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.glsl
index 7d40377..f226543 100644
--- a/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cosh/f67ff1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_f67ff1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl
index cd3110a..db9daa2 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_208d46();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_208d46();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl
index f84dc7d..f53c06d 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_6d4656();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_6d4656();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl
index 26c174e..5662fbc 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_70783f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_70783f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl
index 3300d38..7e10e3a 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_7c38a6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_7c38a6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl
index 51da3b4..5a492b7 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_858d40();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_858d40();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl
index 83e8564..db8513b 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_ab6345();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_ab6345();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl
index cd65d86..a82a8c6 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_eab32b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_eab32b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl
index 5d486ab..b56523b 100644
--- a/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_f70103();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countLeadingZeros_f70103();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl
index 61c8e11..c009b54 100644
--- a/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_0d0e46();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_0d0e46();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl
index e21431b..785b234 100644
--- a/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_0f7980();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_0f7980();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl
index 06720bd..56605b6 100644
--- a/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_65d2ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_65d2ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl
index 5f28432..1674568 100644
--- a/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_690cfc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_690cfc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl
index 25c4489..d624837 100644
--- a/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_94fd81();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_94fd81();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl
index 1e18403..3831007 100644
--- a/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_ae44f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_ae44f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl
index 91eab0d..7f2f527 100644
--- a/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_af90e2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_af90e2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl
index 2e749f8..71ce980 100644
--- a/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_fd88b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_fd88b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl
index e392b5f..b16ee05 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_1ad138();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_1ad138();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl
index c941567..9c5c6e9 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_1dc84a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_1dc84a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl
index 2e2dbe2..5a39027 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_21e394();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_21e394();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl
index a577774..ba8cc0d 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_327c37();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_327c37();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl
index bd9cff4..82e0bd6 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_42fed6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_42fed6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl
index deaa355..e77151f 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_8ed26f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_8ed26f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl
index 8d52a9a..d8af4cc 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_acfacb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_acfacb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl
index 85c7093..130c911 100644
--- a/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_d2b4a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countTrailingZeros_d2b4a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl
index e5738fb..0a56431 100644
--- a/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cross_041cb0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cross_041cb0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.glsl
index 98bc652..cb0d823 100644
--- a/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cross/1d7933.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cross_1d7933();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.glsl
index 0c9d2d7..bc484b5 100644
--- a/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/cross/9857cb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cross_9857cb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cross_9857cb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl
index cfb6b6e..d3a53cd 100644
--- a/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_0d170c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_0d170c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl
index 6472097..aa584e9 100644
--- a/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_1ad5df();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_1ad5df();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl
index eedc1de..fb1d3c2 100644
--- a/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_2af623();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_2af623();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.glsl
index 84ed813..9aec79c 100644
--- a/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/3055d3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_3055d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_3055d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl
index ed6a48e..24a1c65 100644
--- a/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_51f705();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_51f705();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.glsl
index 3078892..3701258 100644
--- a/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/5e9805.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_5e9805();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_5e9805();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.glsl
index 2d1526a..98bf657 100644
--- a/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/810467.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_810467();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.glsl
index 54fdfa9..ae81504 100644
--- a/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/c0880c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_c0880c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.glsl
index 6a7485d..1b3d4c9 100644
--- a/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/d43a49.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_d43a49();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.glsl
index 9a17d71..368d9b2 100644
--- a/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/dfe8f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_dfe8f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_dfe8f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.glsl
index d3b0966..249a404 100644
--- a/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/f59715.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_f59715();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_f59715();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.glsl
index 413f77f..0dd80f9 100644
--- a/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/degrees/fafa7e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 57.295780181884765625f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_fafa7e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.glsl
index b07b0a8..e89f343 100644
--- a/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/1bf6e7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_1bf6e7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl
index 45a5164..3290980 100644
--- a/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_2b62ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_2b62ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.glsl
index e392bf1..c952558 100644
--- a/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/32bfde.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_32bfde();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_32bfde();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl
index 4f81064..973ac5c 100644
--- a/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_a0a87c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_a0a87c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.glsl
index 3c6e200..23a0c1e 100644
--- a/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/c8251d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_c8251d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.glsl
index 085877d..2b1ebed 100644
--- a/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/cefdf3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_cefdf3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.glsl
index 31d2575..8b9b12e 100644
--- a/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/d7c86f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_d7c86f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_d7c86f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl
index 56e4010..eda9316 100644
--- a/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_e19305();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_e19305();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.glsl
index 05db934..79f92ea 100644
--- a/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/determinant/fc12a5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_fc12a5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_fc12a5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl
index 6a4504f..693e17c 100644
--- a/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_0657d4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_0657d4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.glsl
index ecda58d..da9ea92 100644
--- a/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/3a175a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_3a175a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.glsl
index d2525ef..abb415c 100644
--- a/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/7272f3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_7272f3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_7272f3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.glsl
index bf89ba6..ab91ce9 100644
--- a/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/7d201f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_7d201f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_7d201f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.glsl
index 0973bb6..0355740 100644
--- a/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/83911f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_83911f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.glsl
index 6c74f75..144a02b 100644
--- a/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/892a5d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_892a5d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_892a5d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.glsl
index 8159cc3..34df2c8 100644
--- a/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/928fa0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_928fa0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_928fa0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl
index f471291..f7affc9 100644
--- a/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_9646ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_9646ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl
index ab46568c..5514be0 100644
--- a/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_aa4055();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_aa4055();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.glsl
index a77edcc..8c9b4bf 100644
--- a/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/ac5535.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_ac5535();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl
index dbff28e..416ca6c 100644
--- a/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_cfed73();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_cfed73();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.glsl
index 262264f..ae55569 100644
--- a/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/distance/f9c9ee.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_f9c9ee();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.glsl
index 6c2654e..837b28a 100644
--- a/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/08eb56.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 4.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_08eb56();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl
index a4388d8..f6da6aa 100644
--- a/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_0c577b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_0c577b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.glsl
index 6f3d31a..3300d5c 100644
--- a/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/0d2c2e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_0d2c2e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.glsl
index f779e7f..890cd59 100644
--- a/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/14bc63.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 2;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_14bc63();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.glsl
index d45a008..5b7173f 100644
--- a/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/5a4c8f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 3.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_5a4c8f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl
index f0177e6..e908bed 100644
--- a/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_7548a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_7548a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl
index e8f75b9..93fb81a 100644
--- a/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_883f0e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_883f0e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.glsl
index 3db51b2..0a46c5c 100644
--- a/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/8e40f1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_8e40f1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_8e40f1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl
index 0ca4287..17448ee 100644
--- a/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_97c7ee();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_97c7ee();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl
index 0145a91..4065a58 100644
--- a/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_ba4246();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_ba4246();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.glsl
index a596451..d23282b 100644
--- a/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/c11efe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 3;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_c11efe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.glsl
index 4cffa11..ac28fa9 100644
--- a/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/cd5a04.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_cd5a04();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_cd5a04();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.glsl
index 1361537..78aa583 100644
--- a/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/d0d179.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_d0d179();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_d0d179();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl
index e4700cc..a5039d9 100644
--- a/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_e994c7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_e994c7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.glsl
index 842136e..56433fa 100644
--- a/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/eb9fbf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 4;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_eb9fbf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl
index 3c312f2..2e1053a 100644
--- a/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_ef6b1d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_ef6b1d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl
index 02d4c12..ffc48c2 100644
--- a/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_f1312c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_f1312c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl
index 9446690..3131ddd 100644
--- a/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_fc5f7c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_fc5f7c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.glsl
index 3c4fb82..92df189 100644
--- a/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot4I8Packed/881e62.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot4I8Packed_881e62();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot4I8Packed_881e62();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.glsl
index 9a979eb..8f4909e 100644
--- a/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/dot4U8Packed/fbed7b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot4U8Packed_fbed7b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot4U8Packed_fbed7b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl
index 1d0d1f0..a7258ae 100644
--- a/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_0f70eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_0f70eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.glsl
index 4c6b2c7..7cc9876 100644
--- a/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/13806d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_13806d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_13806d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl
index fbf68ac..a9b7e6f 100644
--- a/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_1951e7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_1951e7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.glsl
index 12a235f..8bfc319 100644
--- a/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/2e08e2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_2e08e2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_2e08e2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.glsl
index ffb2281..1779e47 100644
--- a/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/49e4c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.71828174591064453125f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_49e4c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.glsl
index 18e29c9..aa62c1b 100644
--- a/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/611a87.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_611a87();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_611a87();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.glsl
index 7756de7..44df8d9 100644
--- a/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/699629.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_699629();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl
index 4ef08c9..de4818f 100644
--- a/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_771fd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_771fd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.glsl
index 3a77649..f941294 100644
--- a/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/bda5bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_bda5bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.glsl
index a49d059..27fc2d5 100644
--- a/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/c18fe9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_c18fe9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_c18fe9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl
index b9c4cb0..b26a8ef 100644
--- a/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_d98450();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_d98450();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.glsl
index 022e350..d3685b8 100644
--- a/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp/dad791.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_dad791();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.glsl
index d6f37e3..5a9c831 100644
--- a/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/151a4c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_151a4c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_151a4c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.glsl
index 941c061..5486cc4 100644
--- a/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/18aa76.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_18aa76();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl
index d73d250..9c30a65 100644
--- a/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_1f8680();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_1f8680();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.glsl
index 265400d..5c3ee81 100644
--- a/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/303753.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_303753();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.glsl
index 0d76ddc..01cb4d9 100644
--- a/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/751377.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_751377();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_751377();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.glsl
index 57c33e4..1f5e49f 100644
--- a/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/8bd72d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_8bd72d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl
index 70f3854..af465df 100644
--- a/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_a9d0a7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_a9d0a7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.glsl
index 33dee9d..58aa158 100644
--- a/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/b408e4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_b408e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_b408e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl
index 8a6cb0f..dada2fe 100644
--- a/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_d6777c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_d6777c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl
index 9eb5f94..8ef96fc 100644
--- a/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_dea523();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_dea523();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.glsl
index fb8cd2c..7fdccc5 100644
--- a/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/f4f0f1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_f4f0f1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.glsl
index e203996..d045d56 100644
--- a/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/exp2/ffa827.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_ffa827();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_ffa827();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl
index e0e2805..fcbf54f 100644
--- a/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_12b197();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_12b197();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl
index 0be4dc8..2c65b97 100644
--- a/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_249874();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_249874();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl
index 3837e29..42b67bd 100644
--- a/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_631377();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_631377();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl
index 34a7e60..e10115c 100644
--- a/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_a99a8d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_a99a8d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl
index 884e4ef..79e0fe0 100644
--- a/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_ce81f8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_ce81f8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl
index 7db1197..846efa2 100644
--- a/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_e04f5d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_e04f5d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl
index 26b2085..7c1d7ce 100644
--- a/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_f28f69();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_f28f69();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl
index eb8cdb0..38bd072 100644
--- a/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_fb850f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = extractBits_fb850f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.glsl
index 423c9b6..2ecc613 100644
--- a/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/2c4d14.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_2c4d14();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.glsl
index b44beb3..3695df8 100644
--- a/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/524986.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_524986();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_524986();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl
index efa6561..372fbe6 100644
--- a/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_5afbd5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_5afbd5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl
index 365f629..6d10eaf 100644
--- a/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_b316e5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_b316e5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.glsl
index d2cffb7..ed7a559 100644
--- a/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/b42ef3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_b42ef3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.glsl
index 14f0958..7038928 100644
--- a/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/cc63dc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_cc63dc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_cc63dc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl
index da5d905..117febd 100644
--- a/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_e6908b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_e6908b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.glsl
index e163c46..6abafec 100644
--- a/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/fb0f2e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_fb0f2e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_fb0f2e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.glsl
index 46928e3..940d6c0 100644
--- a/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/faceForward/fe522b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_fe522b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl
index 9db7f4c..a4a1d92 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_000ff3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_000ff3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl
index f1e9388..af6485d 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_35053e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_35053e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl
index 865d5d2..28e7946 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_3fd7d0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_3fd7d0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl
index e82ab0b..fd537b7 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_57a1a3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_57a1a3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl
index 7d3bac4..d8178ad 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_6fe804();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_6fe804();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl
index fa1f970..2df82bb 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_a622c2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_a622c2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl
index 39abc34..48614a9 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_c1f940();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_c1f940();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl
index 8026b85..6d0967c 100644
--- a/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_f0779d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstLeadingBit_f0779d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl
index 9ba71a1..647a7cd 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_110f2c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_110f2c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl
index f72b6c9..5653bc4 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_3a2acc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_3a2acc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl
index c6637f3..d749532 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_45eb10();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_45eb10();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl
index 63464aa..f11d64d 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_47d475();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_47d475();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl
index b2be643..4565b63 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_50c072();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_50c072();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl
index dcef7c0..c3e4b3d 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_7496d6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_7496d6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl
index 35d82d5..b15aade 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_86551b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_86551b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl
index b7c89ba..4997c34 100644
--- a/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_cb51ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = firstTrailingBit_cb51ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.glsl
index cf16314..956562d 100644
--- a/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/218952.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_218952();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.glsl
index 2e721ba..d041d2b 100644
--- a/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/3802c0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_3802c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_3802c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl
index 8c5b58e..a9ec51c 100644
--- a/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_3bccc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_3bccc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl
index 52abd1e..4e1ff22 100644
--- a/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_5fc9ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_5fc9ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl
index 1221475..b57019d 100644
--- a/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_60d7ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_60d7ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl
index db7d14a..cf0ab76 100644
--- a/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_66f154();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_66f154();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.glsl
index 04c6c6d..12c3619 100644
--- a/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/84658c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_84658c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_84658c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.glsl
index 9424220..bd9c6bc 100644
--- a/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/953774.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_953774();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.glsl
index 1c9e19b..6371357 100644
--- a/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/a2d31b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_a2d31b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_a2d31b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.glsl
index dc24f97..f8029fe 100644
--- a/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/b6e09c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_b6e09c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_b6e09c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.glsl
index 8e13bf2..e959d52 100644
--- a/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/dcd5a2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_dcd5a2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.glsl
index 4805cfa..31b9828 100644
--- a/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/floor/e585ef.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_e585ef();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.glsl
index 2ec282e..8fb3971 100644
--- a/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/143d5d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_143d5d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.glsl
index 81e5e75..038232e 100644
--- a/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/1f5084.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_1f5084();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl
index a39e07e..617ba0e 100644
--- a/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_26a7a9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_26a7a9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.glsl
index dbcf956..8c8f693 100644
--- a/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/466442.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_466442();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl
index 4c05be3..b303b43 100644
--- a/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_6a3283();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_6a3283();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.glsl
index 7e94831..8a0087d 100644
--- a/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/ab7818.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_ab7818();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_ab7818();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.glsl
index 3ca37f5..3eecf31 100644
--- a/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/bf21b6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_bf21b6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_bf21b6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl
index a5eaa5f..ae473d0 100644
--- a/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_c10ba3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_c10ba3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.glsl
index 041c389..158dfc5 100644
--- a/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/c8abb3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_c8abb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_c8abb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl
index baf64e7..39e8a41 100644
--- a/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_e17c5c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_e17c5c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.glsl
index 5a81330..89b3a25 100644
--- a/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/e7abdc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_e7abdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_e7abdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.glsl
index b445047..cda000a 100644
--- a/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fma/eb25d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_eb25d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.glsl
index b781a86..f02e887 100644
--- a/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/181aa9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_181aa9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_181aa9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.glsl
index e368c33..b8c9bde 100644
--- a/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/2eddfe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.25f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_2eddfe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.glsl
index 036d25e..6a6ac7b 100644
--- a/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/498c77.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_498c77();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_498c77();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.glsl
index b6a6b1b..ad195d4 100644
--- a/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/7e3f2d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_7e3f2d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl
index 62faafc..ea88b18 100644
--- a/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_8bc1e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_8bc1e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl
index fbec0e3..c22c252 100644
--- a/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_943cb1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_943cb1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.glsl
index 99887ee..c0670e7 100644
--- a/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/958a1d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_958a1d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_958a1d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl
index a9b7163..516e092 100644
--- a/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_a49758();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_a49758();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.glsl
index e5883f1..a83a432 100644
--- a/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/eb38ce.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_eb38ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_eb38ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.glsl
index 5361ce5..13a6561 100644
--- a/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/ed00ca.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_ed00ca();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.glsl
index a62fe0a..38ff4b3 100644
--- a/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/ed2f79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_ed2f79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl
index 91dcdb8..e9c3a26 100644
--- a/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_fa5c71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_fa5c71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.glsl
index 708f6a3..c6ff05b 100644
--- a/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/34bbfb.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_34bbfb() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_34bbfb() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec4_f32 res = frexp_result_vec4_f32(vec4(0.5f), ivec4(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_34bbfb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.glsl
index daca8b7..23a19da 100644
--- a/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/3dd21e.wgsl.expected.glsl
@@ -8,8 +8,8 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_3dd21e() {
@@ -26,8 +26,8 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_3dd21e() {
@@ -45,8 +45,8 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -57,10 +57,10 @@
   frexp_result_vec4_f16 res = frexp_result_vec4_f16(f16vec4(0.5hf), ivec4(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_3dd21e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
index 6c6a675..1367fdd 100644
--- a/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_4b2200() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_4b2200() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_f32 res = frexp_result_f32(0.5f, 1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_4b2200();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.glsl
index c224288..7a6a796 100644
--- a/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/5257dd.wgsl.expected.glsl
@@ -8,8 +8,8 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 void frexp_5257dd() {
@@ -26,8 +26,8 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 void frexp_5257dd() {
@@ -45,8 +45,8 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -57,10 +57,10 @@
   frexp_result_f16 res = frexp_result_f16(0.5hf, 1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_5257dd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.glsl
index 236c1a2..37a9600 100644
--- a/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/5f47bf.wgsl.expected.glsl
@@ -8,8 +8,8 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_5f47bf() {
@@ -26,8 +26,8 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_5f47bf() {
@@ -45,8 +45,8 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -57,10 +57,10 @@
   frexp_result_vec2_f16 res = frexp_result_vec2_f16(f16vec2(0.5hf), ivec2(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_5f47bf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.glsl
index 2b9d83f..19f8332 100644
--- a/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/6fb3ad.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_6fb3ad() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_6fb3ad() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec2_f32 res = frexp_result_vec2_f32(vec2(0.5f), ivec2(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_6fb3ad();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
index 55b368b..0b5e8f9 100644
--- a/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_77af93() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_77af93() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec4_f32 res = frexp_result_vec4_f32(vec4(0.5f), ivec4(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_77af93();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
index 72fd56d..602e2da 100644
--- a/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_979800() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_979800() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec3_f32 res = frexp_result_vec3_f32(vec3(0.5f), ivec3(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_979800();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.glsl
index 96a0ced..50e5745 100644
--- a/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/ae4a66.wgsl.expected.glsl
@@ -8,8 +8,8 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_ae4a66() {
@@ -26,8 +26,8 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_ae4a66() {
@@ -45,8 +45,8 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -57,10 +57,10 @@
   frexp_result_vec3_f16 res = frexp_result_vec3_f16(f16vec3(0.5hf), ivec3(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_ae4a66();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.glsl
index 07a69c9..28d42b7 100644
--- a/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/bee870.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_bee870() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_bee870() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_f32 res = frexp_result_f32(0.5f, 1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_bee870();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.glsl
index 2e1a8f3..41847a5 100644
--- a/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/bf45ae.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_bf45ae() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_bf45ae() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec3_f32 res = frexp_result_vec3_f32(vec3(0.5f), ivec3(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_bf45ae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
index e4fe468..f5d9a1f 100644
--- a/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_eb2421() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_eb2421() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec2_f32 res = frexp_result_vec2_f32(vec2(0.5f), ivec2(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_eb2421();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl
index 6624c46..72a0994 100644
--- a/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_3c7ba5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_3c7ba5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl
index 75e5a8f..3bfcaf5 100644
--- a/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_428b0b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_428b0b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl
index aa62d58..55756dd 100644
--- a/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_51ede1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_51ede1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl
index 57160be..42f30ba 100644
--- a/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_65468b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_65468b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl
index f2845a4..77aeffe 100644
--- a/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_87826b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_87826b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl
index 3c5b365..c473c3e 100644
--- a/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_d86978();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_d86978();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl
index ced7f5a..30827b8 100644
--- a/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_e3e3a2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_e3e3a2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl
index d4c46a8..960b7f3 100644
--- a/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_fe6ba6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = insertBits_fe6ba6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.glsl
index 3c6f47b..54115aa 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/07a6fe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_07a6fe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.glsl
index 73be392..1b4aae1 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/440300.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_440300();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_440300();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.glsl
index 24f645b..b53a4e9 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/4ca6d6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_4ca6d6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.glsl
index cc3c4ee..13e929a 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/5f51f8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_5f51f8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_5f51f8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.glsl
index 0d98d47..4b13a55 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/6d0783.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_6d0783();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl
index aadb49a..426003f 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_84407e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_84407e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl
index c6e2631..b4df651e 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_8f2bd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_8f2bd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl
index beecfa6..af5e393 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_b197b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_b197b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.glsl
index 22acbaf..f84dbb9 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/b85ebd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_b85ebd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_b85ebd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl
index 7d92299..a372422 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_c22347();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_c22347();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.glsl
index b786cd7..9e812de 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/cbdc70.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_cbdc70();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_cbdc70();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.glsl
index 87afaba..e57bdd0 100644
--- a/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/f60c1c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_f60c1c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.glsl
index 35ff5b7..c86b095 100644
--- a/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/082c1f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_082c1f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_082c1f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.glsl
index 4e45f9f..acfc4be 100644
--- a/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/217a31.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_217a31();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_217a31();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.glsl
index 53f7019..5eae8b4 100644
--- a/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/2bfc68.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_2bfc68();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.glsl
index 4572e9e..b75de44 100644
--- a/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/2c6370.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_2c6370();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.glsl
index 51af453..100c186 100644
--- a/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/376938.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_376938();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.glsl
index c98c6af..1ea1679 100644
--- a/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/3d90b4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_3d90b4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_3d90b4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.glsl
index c15ab68..8621dea 100644
--- a/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/4a3ad9.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_4a3ad9();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.glsl
index 3693b90..2c4ab55 100644
--- a/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/593ff3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_593ff3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_593ff3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.glsl
index d60dc9e..b235efc 100644
--- a/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/624e0c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_624e0c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_624e0c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.glsl
index c8d4501..b54bc4d 100644
--- a/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/65a7bd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_65a7bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_65a7bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.glsl
index 206b462..9ad8be3 100644
--- a/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/71ebe3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_71ebe3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.glsl
index f36477f..6f3e7f6 100644
--- a/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/7485ce.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_7485ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_7485ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.glsl
index e0cf74b..91b2d1b 100644
--- a/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/7fa13c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_7fa13c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_7fa13c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.glsl
index 18bda3f..0eddbef 100644
--- a/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/8a0c2f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_8a0c2f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_8a0c2f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.glsl
index 4dd4472..36ccdfe 100644
--- a/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/8e43e9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_8e43e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_8e43e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.glsl
index c57b72b..0ed5ee0 100644
--- a/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/a22679.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_a22679();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_a22679();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl
index 0dd63aa..506e48c 100644
--- a/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_a31cdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_a31cdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.glsl
index 91a26ee..58846d8 100644
--- a/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/a6126e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_a6126e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl
index dc085bf..8eebe18 100644
--- a/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_abd718();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_abd718();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.glsl
index d1b7ded..50304f1 100644
--- a/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/c9d0b7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_c9d0b7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_c9d0b7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.glsl
index 0e37845..ca9415e 100644
--- a/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/cb0faf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_cb0faf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl
index a114ab6..73acc90 100644
--- a/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_cc9cde();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_cc9cde();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl
index 864ac1b..a3856c8 100644
--- a/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_db8b49();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_db8b49();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.glsl
index 659009e..1b62dcc 100644
--- a/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/ldexp/fdbc7b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_fdbc7b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl
index f5553e8..ca12c66 100644
--- a/test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_056071();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_056071();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.glsl
index 84faef3..ff99419 100644
--- a/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/3f0e13.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_3f0e13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_3f0e13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.glsl
index 9512d5f..987d6ee 100644
--- a/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/555aba.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_555aba();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.glsl
index 93ce88a..83b46b0 100644
--- a/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/5b1a9b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_5b1a9b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_5b1a9b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl
index 373c000..471e4f6 100644
--- a/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_602a17();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_602a17();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.glsl
index f0013e3..87d36f4 100644
--- a/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/7b4741.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_7b4741();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.glsl
index 503cd1a..303028d 100644
--- a/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/936ad5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_936ad5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl
index 7698078..45a1be6 100644
--- a/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_afde8b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_afde8b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.glsl
index 35871da..7472e20 100644
--- a/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/ba16d6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_ba16d6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_ba16d6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl
index 036b6a1..2c810c8 100644
--- a/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_becebf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_becebf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.glsl
index a83b00e..868b8a2 100644
--- a/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/c158da.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_c158da();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_c158da();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.glsl
index d0ad26a..f60137f 100644
--- a/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/length/c2c544.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_c2c544();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl
index bc59442..eccaa59 100644
--- a/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_3da25a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_3da25a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/655989.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/655989.wgsl.expected.glsl
index 1b83e84..964ee61 100644
--- a/test/tint/builtins/gen/literal/log/655989.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/655989.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_655989();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.glsl
index a219be3c..4e80bc2 100644
--- a/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/697e1d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_697e1d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.glsl
index 9e0416a..8a6df4e 100644
--- a/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/6ff86f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_6ff86f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_6ff86f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl
index ac15647..bf5aa68 100644
--- a/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_7114a6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_7114a6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.glsl
index 4317698..f5c1211 100644
--- a/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/8f0e32.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_8f0e32();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_8f0e32();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl
index 18182ca..186a312 100644
--- a/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_b2ce28();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_b2ce28();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.glsl
index fe47a07..19094de 100644
--- a/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/b8088d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_b8088d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.glsl
index ec04f3a..a27b313 100644
--- a/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/c9f489.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_c9f489();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_c9f489();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.glsl
index 57896e3..77dbdb3 100644
--- a/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/cdbdc1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_cdbdc1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_cdbdc1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl
index 26e68d4..afe71c8 100644
--- a/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_f4c570();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_f4c570();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.glsl
index 68faad1..8cf35f1 100644
--- a/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log/f60cc7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_f60cc7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.glsl
index 9bc9523..fb0e0d6 100644
--- a/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/0fbd39.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_0fbd39();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.glsl
index f7cf207..aac72f8 100644
--- a/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/38b478.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_38b478();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_38b478();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl
index f400eb9..ec45ac6 100644
--- a/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_4036ed();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_4036ed();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.glsl
index 3ee7934..ca930c4 100644
--- a/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/5b464b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_5b464b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.glsl
index 4bc9e4b..8836fda 100644
--- a/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/6b8954.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_6b8954();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.glsl
index a991965..5f52316 100644
--- a/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/776088.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_776088();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_776088();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.glsl
index c77cb55..c0a3b42 100644
--- a/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/8c10b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_8c10b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_8c10b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl
index 2e9c029..2cf7ab5 100644
--- a/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_902988();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_902988();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.glsl
index 89210cb..6b2fb02 100644
--- a/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/a52bbb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_a52bbb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl
index d6ab1ad..ce88615 100644
--- a/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_adb233();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_adb233();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl
index c2fb399..38accab 100644
--- a/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_aea659();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_aea659();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.glsl
index e9c73a2..178d7fc 100644
--- a/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/log2/fb9f0b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_fb9f0b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_fb9f0b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.glsl
index 093b25c..d96f478 100644
--- a/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/067f3a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_067f3a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl
index fcc3e35..e01486c 100644
--- a/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_0c0aae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_0c0aae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.glsl
index 1fdce7b..d9f10ee 100644
--- a/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/111ac0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_111ac0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_111ac0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.glsl
index 0caf243..be826b6 100644
--- a/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/19070a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_19070a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl
index f764638..c96ef91 100644
--- a/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_25eafe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_25eafe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl
index 6e38d63..408ef4a 100644
--- a/test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_320815();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_320815();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.glsl
index eab3274..8a93358 100644
--- a/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/34956e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_34956e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_34956e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/445169.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/445169.wgsl.expected.glsl
index eb37734..ced1ab7 100644
--- a/test/tint/builtins/gen/literal/max/445169.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/445169.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_445169();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_445169();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl
index 7a58db3..bb7a951 100644
--- a/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_44a39d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_44a39d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl
index 0ec782b..ca06bae 100644
--- a/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_453e04();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_453e04();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl
index a567fb3..c6c2bd9 100644
--- a/test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_462050();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_462050();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.glsl
index 9137b51..62b61d7 100644
--- a/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/482d23.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_482d23();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl
index 6596995..fcde98f 100644
--- a/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_4883ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_4883ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.glsl
index 11b6e1c..b5ab258 100644
--- a/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/4bbff2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_4bbff2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl
index 7145e96..cc093b0 100644
--- a/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_85e6bc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_85e6bc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.glsl
index e9ec136..4f8cefb 100644
--- a/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/a1b196.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_a1b196();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl
index 8bbe119..d6a1986 100644
--- a/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_a93419();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_a93419();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl
index 5b2ba1c..9203328 100644
--- a/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_b1b73a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_b1b73a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.glsl
index a4a749d..e905352 100644
--- a/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/c023dd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_c023dd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.glsl
index c32dbd9..0287cd3 100644
--- a/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/caa3d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_caa3d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl
index 9e7d6b4..a3af964 100644
--- a/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_ce7c30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_ce7c30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.glsl
index 305cf9c..e32d6cf 100644
--- a/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/de6b87.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_de6b87();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.glsl
index 8be3e64..afa0b82 100644
--- a/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/e14f2b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_e14f2b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_e14f2b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl
index 977c6cd..98c04c3 100644
--- a/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_e8192f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_e8192f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl
index 7551550..42c1796 100644
--- a/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_03c7e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_03c7e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl
index ea457c0..49027f7 100644
--- a/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_0dc614();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_0dc614();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/364910.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/364910.wgsl.expected.glsl
index d9e092d..455fb80 100644
--- a/test/tint/builtins/gen/literal/min/364910.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/364910.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_364910();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.glsl
index 84cb1f5..e1e69f2 100644
--- a/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/371bd6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_371bd6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl
index ae9cac6..c257125 100644
--- a/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_3941e1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_3941e1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl
index 077c02b..50c9796 100644
--- a/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_46c5d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_46c5d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.glsl
index be0804a..4c824cd 100644
--- a/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/527b79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_527b79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/717257.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/717257.wgsl.expected.glsl
index d999a7e..a533c10 100644
--- a/test/tint/builtins/gen/literal/min/717257.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/717257.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_717257();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/794711.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/794711.wgsl.expected.glsl
index 84788de..8c997a6 100644
--- a/test/tint/builtins/gen/literal/min/794711.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/794711.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_794711();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.glsl
index 4d55deb..2404ae2 100644
--- a/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/7c710a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_7c710a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_7c710a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl
index 9c01dcf..bc777f2 100644
--- a/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_82b28f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_82b28f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.glsl
index f14d0c3..6495306 100644
--- a/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/84c9fe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_84c9fe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl
index 80b6a0f..6cf44c7 100644
--- a/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_93cfc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_93cfc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.glsl
index aa32c2f..d463d6c 100644
--- a/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/98e797.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_98e797();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl
index b81a88a..f46ea1a 100644
--- a/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_a45171();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_a45171();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl
index ffacfe2..fabf6b0 100644
--- a/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_aa28ad();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_aa28ad();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.glsl
index 31817d1..e22ba68 100644
--- a/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/ab0acd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_ab0acd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_ab0acd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.glsl
index 7bf1b4a..b389520 100644
--- a/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/ac84d6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_ac84d6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_ac84d6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl
index 40e270a..fa79892 100644
--- a/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_af326d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_af326d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.glsl
index a46c24a..8bd5bfc 100644
--- a/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/af364e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_af364e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl
index 2e3305f..ccdc220 100644
--- a/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c70bb7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c70bb7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl
index b836727..8b7d01a 100644
--- a/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c73147();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c73147();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl
index be3201a..850a862 100644
--- a/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c76fa6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c76fa6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.glsl
index 26dac08..4da7410 100644
--- a/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/min/e780f9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_e780f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_e780f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl
index 0c7feb5..a232e5d 100644
--- a/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_0c8c33();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_0c8c33();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl
index 0977b97..8008eb2 100644
--- a/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_1faeb1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_1faeb1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.glsl
index c44e404..0557a5b 100644
--- a/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/275cac.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_275cac();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl
index 59d9775..6fb5678 100644
--- a/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_2fadab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_2fadab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.glsl
index 44db189..5aaf1fc 100644
--- a/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/30de36.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_30de36();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl
index 3d0ab49..bdfd4e4 100644
--- a/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_315264();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_315264();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.glsl
index fae8681..c8e9df6 100644
--- a/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/343c49.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_343c49();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.glsl
index f1371cf..2883a59 100644
--- a/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/38cbbb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_38cbbb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_38cbbb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.glsl
index 00aef64..7a2b28a 100644
--- a/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/42d11d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_42d11d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl
index f87a7e4..d4422bc 100644
--- a/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_4f0b5e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_4f0b5e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.glsl
index bbaf119..df1bfe4 100644
--- a/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/63f2fd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_63f2fd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_63f2fd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl
index 5eb8e73..acdbcfe 100644
--- a/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_6f8adc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_6f8adc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.glsl
index fdacfa2..ad6484f 100644
--- a/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/98007a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_98007a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.glsl
index 2f8d712..36d941d 100644
--- a/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/98ee3e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_98ee3e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_98ee3e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.glsl
index a084d1a..a873075 100644
--- a/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/9c2681.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_9c2681();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.glsl
index 7bfc936..89f7ac9 100644
--- a/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/c1aec6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_c1aec6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_c1aec6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl
index a4d71ce..cc7e552 100644
--- a/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_c37ede();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_c37ede();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.glsl
index 182d7e0..d66bd95 100644
--- a/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/e46a83.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_e46a83();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_e46a83();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.glsl
index 2e166fe..484c410 100644
--- a/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/ee2468.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_ee2468();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_ee2468();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.glsl
index fc304e3..f0b3132 100644
--- a/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/ef3575.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_ef3575();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.glsl
index 4414d86..44956f7 100644
--- a/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/mix/f1a543.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_f1a543();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_f1a543();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
index ec42c1e..bcb9fb4 100644
--- a/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec2_f32 res = modf_result_vec2_f32(vec2(-0.5f), vec2(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_2d50da();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.glsl
index d3eca2d..9904c2d 100644
--- a/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/45005f.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
@@ -26,7 +26,7 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
@@ -45,7 +45,7 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
@@ -57,10 +57,10 @@
   modf_result_vec3_f16 res = modf_result_vec3_f16(f16vec3(-0.5hf), f16vec3(-1.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_45005f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
index a722f3b..b1afe6c 100644
--- a/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec4_f32 res = modf_result_vec4_f32(vec4(-0.5f), vec4(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_4bfced();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
index 9016b53..579ce7c 100644
--- a/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec3_f32 res = modf_result_vec3_f32(vec3(-0.5f), vec3(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_5ea256();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.glsl
index f8e1458..9171311 100644
--- a/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/68d8ee.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec3_f32 res = modf_result_vec3_f32(vec3(-0.5f), vec3(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_68d8ee();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.glsl
index 8ec8490..0aa494c 100644
--- a/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/732aa6.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec2_f32 res = modf_result_vec2_f32(vec2(-0.5f), vec2(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_732aa6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.glsl
index 6724696..45f9f85 100644
--- a/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/8dbbbf.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
@@ -26,7 +26,7 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
@@ -45,7 +45,7 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
@@ -57,10 +57,10 @@
   modf_result_f16 res = modf_result_f16(-0.5hf, -1.0hf);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_8dbbbf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.glsl
index 4fa2bd8..2b67aad 100644
--- a/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/995934.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
@@ -26,7 +26,7 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
@@ -45,7 +45,7 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
@@ -57,10 +57,10 @@
   modf_result_vec4_f16 res = modf_result_vec4_f16(f16vec4(-0.5hf), f16vec4(-1.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_995934();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.glsl
index 0c3ee1f..f347e8a 100644
--- a/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/a545b9.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
@@ -26,7 +26,7 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
@@ -45,7 +45,7 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
@@ -57,10 +57,10 @@
   modf_result_vec2_f16 res = modf_result_vec2_f16(f16vec2(-0.5hf), f16vec2(-1.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_a545b9();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
index 30f75c6..72a9d5d 100644
--- a/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_f32 res = modf_result_f32(-0.5f, -1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_bbf7f7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.glsl
index ff8e130..654ad99 100644
--- a/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/c15f48.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_f32 res = modf_result_f32(-0.5f, -1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_c15f48();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.glsl
index 01eb486..85eda3a 100644
--- a/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/f3d1f9.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec4_f32 res = modf_result_vec4_f32(vec4(-0.5f), vec4(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_f3d1f9();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.glsl
index c131e8c..a972a6b 100644
--- a/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/39d5ec.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_39d5ec();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_39d5ec();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.glsl
index 2f2d4b3..ef93e7d 100644
--- a/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/4eaf61.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_4eaf61();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.glsl
index 696567c..174e500 100644
--- a/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/584e47.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.70710676908493041992f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_584e47();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl
index b9e5fc3..7794117 100644
--- a/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_64d8c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_64d8c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.glsl
index f5f9ca0..0db9844 100644
--- a/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/7990f3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_7990f3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_7990f3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl
index 3773b17..f75e462 100644
--- a/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_9a0aab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_9a0aab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.glsl
index 546d3d4..778e48b 100644
--- a/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/b8cb8d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_b8cb8d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_b8cb8d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.glsl
index 1932078..8b9f618 100644
--- a/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/e7def8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.57735025882720947266f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_e7def8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl
index f858410..b133698 100644
--- a/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_fc2ef1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_fc2ef1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl
index 8cb375f..62f2113 100644
--- a/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16float_0e97b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16float_0e97b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl
index e2c9e96..943e483 100644
--- a/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16snorm_6c169b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16snorm_6c169b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl
index 1f123e1..2893c7f 100644
--- a/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16unorm_0f08e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16unorm_0f08e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl
index cc9ac4e..ac5a650 100644
--- a/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4x8snorm_4d22e7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4x8snorm_4d22e7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl
index abdb8c0..380fac6 100644
--- a/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4x8unorm_95c456();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4x8unorm_95c456();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.glsl
index c4d9e30..a6099aa 100644
--- a/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4xI8/bfce01.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xI8_bfce01();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4xI8_bfce01();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
index ede08d6..02e51b3 100644
--- a/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xI8Clamp_e42b2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4xI8Clamp_e42b2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.glsl
index 968297b..e7a72f4 100644
--- a/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4xU8/b70b53.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xU8_b70b53();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4xU8_b70b53();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
index b7baef2..6f5b12f 100644
--- a/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xU8Clamp_6b8c1b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4xU8Clamp_6b8c1b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl
index 72a0b9f..f1235d3 100644
--- a/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_04a908();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_04a908();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl
index d3204eb..3511e77 100644
--- a/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_46e029();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_46e029();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl
index c37713c..b8eae5e 100644
--- a/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_4a46c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_4a46c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.glsl
index 2b5912b..decaeef 100644
--- a/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/4f33b2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_4f33b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_4f33b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.glsl
index 2e02cdf..6dd9e74 100644
--- a/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/749c42.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_749c42();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.glsl
index 808feb0..c787e86 100644
--- a/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/a8f6b2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_a8f6b2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.glsl
index d95d3c4..3608130 100644
--- a/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/bc91ed.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_bc91ed();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.glsl
index 91c8b10..c7c52ba 100644
--- a/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/ce9ef5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_ce9ef5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_ce9ef5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.glsl
index de5ba33..ade1142 100644
--- a/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/e42f20.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_e42f20();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl
index 61f2697..1a887bb 100644
--- a/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_e60ea5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_e60ea5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.glsl
index 96087f3..622151f 100644
--- a/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/f37b25.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_f37b25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_f37b25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.glsl
index ac4f416..0b0e360 100644
--- a/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/pow/fa5429.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_fa5429();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_fa5429();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.glsl
index 21ac81b..b87d0c0 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/quantizeToF16/12e50e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_12e50e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_12e50e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.glsl
index 9d91238..33d117b 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/quantizeToF16/2cddf3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_2cddf3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_2cddf3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.glsl b/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.glsl
index 6098d10..bed7065 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/quantizeToF16/cba294.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_cba294();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_cba294();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.glsl
index 951f4cd..c1d23ee 100644
--- a/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/quantizeToF16/e8fd14.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_e8fd14();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_e8fd14();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl
index 47f2425..6a25031 100644
--- a/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_09b7fc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_09b7fc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.glsl
index 6dadb1e..1857612 100644
--- a/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/208fd9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_208fd9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_208fd9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.glsl
index 3345eb5..fe31604 100644
--- a/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/379214.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_379214();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.glsl
index cefcdab..6f45d1a 100644
--- a/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/44a9f8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_44a9f8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.glsl
index d2aaa7f..98841d5 100644
--- a/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/44f20b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_44f20b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_44f20b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.glsl
index b9a1b2c..e9e1247 100644
--- a/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/524a91.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_524a91();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl
index 3504898..ab2ac45 100644
--- a/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_61687a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_61687a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl
index d193e43..a8d13f0 100644
--- a/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_6b0ff2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_6b0ff2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.glsl
index 670c2d9..d6ddb66 100644
--- a/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/7ea4c7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_7ea4c7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_7ea4c7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.glsl
index 1074da5..8e01116 100644
--- a/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/bff231.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.01745329238474369049f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_bff231();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl
index 161f4e7..9dc7e68 100644
--- a/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_f96258();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_f96258();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.glsl
index 72218c8..98e357e 100644
--- a/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/radians/fbacf0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_fbacf0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_fbacf0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl
index 0437304..f3975eb 100644
--- a/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_05357e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_05357e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.glsl
index 3bd9c6c..fe7a3b7 100644
--- a/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/310de5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_310de5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_310de5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.glsl
index 796d176..22a4f2f 100644
--- a/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/61ca21.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_61ca21();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_61ca21();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.glsl
index 3b83fb5..bc17bc5 100644
--- a/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/a8baf2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-5.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_a8baf2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl
index 0ae8990..0b33f79 100644
--- a/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_b61e10();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_b61e10();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.glsl
index b342f60..e0a3bf1 100644
--- a/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/bb15ac.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_bb15ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_bb15ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.glsl
index e105264..6090b69 100644
--- a/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/bba2d0.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-3.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_bba2d0();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.glsl
index 4ce8a61..2dd7daf 100644
--- a/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/d7e210.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-7.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_d7e210();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl
index 91f2130..291ed3e 100644
--- a/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_f47fdb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_f47fdb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.glsl
index 23d824d..f57cfe0 100644
--- a/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/0594ba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_0594ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_0594ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.glsl
index c1f9f79..2593be9 100644
--- a/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/570cb3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_570cb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_570cb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl
index 911e815..ad1868a 100644
--- a/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_7e02e6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_7e02e6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.glsl
index ef9be2c..a76d5c9 100644
--- a/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/8984af.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_8984af();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_8984af();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.glsl
index 0b88251..5d3f4bd 100644
--- a/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/8c192a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-7.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_8c192a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl
index facc7b7..d1c8074 100644
--- a/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_cbc1d2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_cbc1d2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl
index 16ad027..a8170e9 100644
--- a/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_cd905f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_cd905f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.glsl
index a65ca56..3d360c4 100644
--- a/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/cf1629.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-3.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_cf1629();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.glsl
index 018b4cd..4770ecb 100644
--- a/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/refract/d7569b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-5.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_d7569b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl
index 551c366..eefe022 100644
--- a/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_222177();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_222177();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl
index 446f9c3..898300e 100644
--- a/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_35fea9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_35fea9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl
index 92bb3f8..b6d25c6 100644
--- a/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_4dbd6f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_4dbd6f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl
index f75a3ef..cb3beaf 100644
--- a/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_7c4269();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_7c4269();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl
index 67a566f..21a16bd 100644
--- a/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_a6ccd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_a6ccd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl
index 5b6c13e..b88df0a 100644
--- a/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_c21bc1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_c21bc1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl
index 3667e53..705e6f7 100644
--- a/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_e1f4c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_e1f4c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl
index 0b8766f..d51322f 100644
--- a/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_e31adf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_e31adf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl
index 3165894..6b80939 100644
--- a/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_106c0b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_106c0b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.glsl
index 8989f40..f3c0d09 100644
--- a/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/184d5a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_184d5a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl
index 6652bbd..545225c 100644
--- a/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_1c7897();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_1c7897();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl
index e46c8d4..1d5b61d 100644
--- a/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_52c84d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_52c84d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.glsl
index 54658a2..02cc6f3 100644
--- a/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/773a8f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 4.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_773a8f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.glsl
index 2905ffc..6daf835 100644
--- a/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/8fdca3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_8fdca3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.glsl
index 3c0ac54..f1ac44a 100644
--- a/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/9078ef.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_9078ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_9078ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl
index 551d648..659fc87 100644
--- a/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_9edc38();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_9edc38();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.glsl
index b0776ed..7b5f661 100644
--- a/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/a1673d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_a1673d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.glsl
index ef451f6..c0d4bc5 100644
--- a/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/d87e84.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_d87e84();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_d87e84();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.glsl
index 2f1df05..e21fd5b 100644
--- a/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/e1bba2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_e1bba2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_e1bba2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.glsl
index 3f450c0..f02f8ce 100644
--- a/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/round/f665b5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_f665b5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_f665b5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.glsl
index 7f5095f..46c072c 100644
--- a/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/270da5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_270da5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_270da5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.glsl
index a41c4b5..49cf35b 100644
--- a/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/462535.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_462535();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_462535();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.glsl
index 9db5286..e94b8cf 100644
--- a/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/4ed8d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_4ed8d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.glsl
index b6a4a22..4fad0df 100644
--- a/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/51567f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_51567f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_51567f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.glsl
index dca2169..7a86eec 100644
--- a/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/6bcddf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_6bcddf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_6bcddf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.glsl
index 48a6565..e2dc4fe 100644
--- a/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/78b37c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_78b37c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.glsl
index 939063a..8ecdaf2 100644
--- a/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/a5b571.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_a5b571();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_a5b571();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.glsl
index bde085a..decdb81 100644
--- a/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/cd2028.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_cd2028();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_cd2028();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.glsl
index 79d8bc8..4dd4536 100644
--- a/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/d55822.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_d55822();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.glsl
index 8551851..16e8088 100644
--- a/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/dcde71.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_dcde71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_dcde71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.glsl
index 6dca2a4..0cc24d0 100644
--- a/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/e40fb6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_e40fb6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.glsl b/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.glsl
index 1158918..b3df309 100644
--- a/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/saturate/e8df56.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_e8df56();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_e8df56();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl
index 6898954..75b78e9 100644
--- a/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_00b848();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_00b848();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl
index 4b0e0d2..4a7610c 100644
--- a/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_01e2cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_01e2cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl
index eadd05d..c47841e 100644
--- a/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_087ea4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_087ea4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/089657.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/089657.wgsl.expected.glsl
index 93f4cb3..e4d5ef1 100644
--- a/test/tint/builtins/gen/literal/select/089657.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/089657.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_089657();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.glsl
index ad67166..b6eed7d 100644
--- a/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/10e73b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_10e73b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_10e73b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.glsl
index 3eefe3e..91383d4 100644
--- a/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/17441a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_17441a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.glsl
index 83e6cc7..2fab076 100644
--- a/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/1ada2a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_1ada2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_1ada2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl
index c805bf0..96d10dc 100644
--- a/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_1e960b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_1e960b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.glsl
index 00e3733..18dd1dc 100644
--- a/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/1f4d93.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_1f4d93();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl
index 335c120..4f3b7cf 100644
--- a/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_266aff();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_266aff();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl
index 4500591..655a059 100644
--- a/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_28a27e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_28a27e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.glsl
index 869bc6c..a0cd61d 100644
--- a/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/2c96d4.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_2c96d4();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.glsl
index 866981c..4cc5940 100644
--- a/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/3a14be.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_3a14be();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl
index 5224ce4..4e16488 100644
--- a/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec3(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_3c25ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_3c25ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl
index fd35bd8..9747eff 100644
--- a/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_416e14();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_416e14();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.glsl
index e371858..bfa9442 100644
--- a/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/431dfb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_431dfb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.glsl
index 13a7b25..66f27f5 100644
--- a/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/43741e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_43741e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/494051.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/494051.wgsl.expected.glsl
index a4cbdf9..3feaa0a 100644
--- a/test/tint/builtins/gen/literal/select/494051.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/494051.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_494051();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.glsl
index 815e216..617c57c 100644
--- a/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/4c4738.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_4c4738();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.glsl
index 066ea1b..8ff3a46 100644
--- a/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/4e60da.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_4e60da();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl
index 4c2219a..c1509f5 100644
--- a/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_51b047();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_51b047();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.glsl
index c35c85c..a3f615a 100644
--- a/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/53d518.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_53d518();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_53d518();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl
index 7460335..0b91597 100644
--- a/test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_713567();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_713567();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl
index aac651f..ddca1ed 100644
--- a/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_78be5f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_78be5f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl
index 6c4f88a..1783154 100644
--- a/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec3(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_80a9a9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_80a9a9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.glsl
index 8d60308..0db3ced 100644
--- a/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/830dd9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_830dd9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_830dd9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.glsl
index fb5bb63..d6ba3ca 100644
--- a/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/86f9bd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_86f9bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_86f9bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl
index 8e96a39..5cc161d 100644
--- a/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_8fa62c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_8fa62c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl
index 847ee66..1a57d0e 100644
--- a/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_99f883();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_99f883();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.glsl
index 193a8db..ca97f53 100644
--- a/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/9b478d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_9b478d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.glsl
index e3f2078..ecc95cc 100644
--- a/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/a081f1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_a081f1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_a081f1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl
index ba1f9c7..0d7f058 100644
--- a/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_a2860e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_a2860e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl
index 67b3f9b..6ed162b 100644
--- a/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ab069f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ab069f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl
index 9e57a56..7e99081 100644
--- a/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_b04721();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_b04721();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.glsl
index c6c50bf..98ef750 100644
--- a/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/b93806.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_b93806();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl
index 97388ef..cc87196 100644
--- a/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bb447f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_bb447f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl
index 8d73dca..6d4516f 100644
--- a/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bb8aae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_bb8aae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl
index a007da6..774c794 100644
--- a/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bf3d29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_bf3d29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl
index 5bddfec..b340908 100644
--- a/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c31f9e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_c31f9e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl
index ba484dd..9dd9292 100644
--- a/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec4(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c41bd1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_c41bd1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl
index 7d59196..79094f3 100644
--- a/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c4a4ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_c4a4ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl
index 6e08f35..2ac8a30 100644
--- a/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec2(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_cb9301();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_cb9301();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.glsl
index 1c27996..8307f0a 100644
--- a/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/dfab3b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_dfab3b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.glsl
index df0c906..10ed0eb0 100644
--- a/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/e381c3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_e381c3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl
index 25a8814..fda3d33 100644
--- a/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec4(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_e3e028();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_e3e028();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl
index 1c7e229..efa4af8 100644
--- a/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ebfea2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ebfea2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.glsl
index 0158ac1..cb0bc2e 100644
--- a/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/ed7c13.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ed7c13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ed7c13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl
index 7ede247..4d69e02 100644
--- a/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ed8a15();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ed8a15();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl
index af00c12..7517d0d 100644
--- a/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, all(equal(res, bvec2(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_fb7e53();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_fb7e53();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.glsl
index 3f20e1f..a5c16a3 100644
--- a/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/0799fd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_0799fd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl
index 0483eee..dafceb2 100644
--- a/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_159665();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_159665();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.glsl
index fb145e1..b8dc362 100644
--- a/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/160933.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_160933();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_160933();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.glsl
index fe5c762..47c2e42 100644
--- a/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/3233fa.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_3233fa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_3233fa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.glsl
index 3848282..30d0f63 100644
--- a/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/3a39ac.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_3a39ac();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.glsl
index 7be9f6b..54c2f69 100644
--- a/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/3bdab6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_3bdab6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.glsl
index b25aa25..ae4ff31 100644
--- a/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/55339e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_55339e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.glsl
index cf865f2..f834a72 100644
--- a/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/58d779.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_58d779();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_58d779();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.glsl
index c172012..91c3a6c 100644
--- a/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/5d283a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_5d283a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_5d283a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.glsl
index dbfc7fb..f9e9b2f 100644
--- a/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/7c85ea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_7c85ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_7c85ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.glsl
index fe4b2ee..8690e82 100644
--- a/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/926015.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_926015();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_926015();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.glsl
index b90ff43..b073f9a 100644
--- a/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/943b2e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_943b2e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.glsl
index 0cf9d00..05841c4 100644
--- a/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/9603b1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_9603b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_9603b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.glsl
index 13c60a51..bd327fa 100644
--- a/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/ab6301.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_ab6301();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl
index cfd72ca..c1edf02 100644
--- a/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_b8f634();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_b8f634();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.glsl
index bf05791..e07aadf 100644
--- a/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/c8289c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_c8289c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.glsl
index c0d5403..4f46ee5 100644
--- a/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/ccdb3c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_ccdb3c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_ccdb3c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl
index 9240e24..d77e57e 100644
--- a/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_d065d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_d065d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl
index b104c38..7ebca7d 100644
--- a/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_dd790e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_dd790e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.glsl
index e967e30..6115b0f 100644
--- a/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sign/f5da6a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_f5da6a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl
index cb7f901..43e68e9 100644
--- a/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_01f241();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_01f241();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.glsl
index d175ca7..d31686e 100644
--- a/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/15b2c6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_15b2c6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.glsl
index 0ea64e9..1e64ca4 100644
--- a/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/2c903b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_2c903b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_2c903b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.glsl
index 3fb76dc..59c8030 100644
--- a/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/3cca11.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_3cca11();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_3cca11();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl
index d0e69fe..b703663 100644
--- a/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_4e3979();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_4e3979();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.glsl
index 6ec7d54..b19751e 100644
--- a/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/5c0712.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_5c0712();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_5c0712();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.glsl
index 31f0cc1..db4efc1 100644
--- a/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/66a59f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_66a59f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_66a59f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.glsl
index 1bd34cb..5b86cd7 100644
--- a/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/67b03c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_67b03c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.glsl
index 68521cd..876498e 100644
--- a/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/68d3ab.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_68d3ab();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.glsl
index 19b00a5..33b271a 100644
--- a/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/a9ab19.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_a9ab19();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl
index 8ff2467..c033bff 100644
--- a/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_b78c91();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_b78c91();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl
index 0b3a96a..a9bff12 100644
--- a/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_fc8bc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_fc8bc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.glsl
index 41f1b84..768fe86 100644
--- a/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/0908c1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_0908c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_0908c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl
index 4c2c49b..7c4fd03 100644
--- a/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_445e33();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_445e33();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.glsl
index 01f0351..d96b9e3 100644
--- a/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/69cce2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_69cce2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_69cce2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.glsl
index 9ffa5f8..45a7053 100644
--- a/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/77a2a3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_77a2a3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl
index 723245d..e04423e 100644
--- a/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_7bb598();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_7bb598();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.glsl
index a86188d..145e40d 100644
--- a/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/924f19.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_924f19();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_924f19();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.glsl
index dbd54c8..2c836fc 100644
--- a/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/9c1092.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_9c1092();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.glsl
index b89578d..cb02562 100644
--- a/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/a3da7c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_a3da7c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl
index 601862e..53ac1b6 100644
--- a/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_b9860e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_b9860e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.glsl
index 302faec..5fed0fe 100644
--- a/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/ba7e25.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_ba7e25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_ba7e25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.glsl
index da38be9..9381fcc 100644
--- a/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/c4df74.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.17520117759704589844f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_c4df74();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl
index 97e9827..b7b4ae4 100644
--- a/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_c9a5eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_c9a5eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.glsl
index 44d3e53..6aac27e 100644
--- a/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/0c481b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_0c481b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.glsl
index 7582558..e6de1b3 100644
--- a/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/0c4ffc.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_0c4ffc();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.glsl
index 31b9bfd..b5ced09 100644
--- a/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/12c031.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_12c031();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_12c031();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl
index 91df0a0..e3d176a 100644
--- a/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_392c19();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_392c19();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl
index 4c67d34..8b451e8 100644
--- a/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_40864c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_40864c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.glsl
index 5475ab3..15629c9 100644
--- a/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/586e12.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_586e12();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_586e12();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.glsl
index b1edc7c..4aa1917 100644
--- a/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/66e4bd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_66e4bd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl
index 214f6eb..de48f48 100644
--- a/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_6c4975();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_6c4975();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.glsl
index 379e156..e769cde 100644
--- a/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/6e7a74.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_6e7a74();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_6e7a74();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.glsl
index 5597388..ca56600 100644
--- a/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/a80fff.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.5f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_a80fff();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl
index d580ef2..b1cdc06 100644
--- a/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_aad1db();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_aad1db();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.glsl
index 63be01a..df15319 100644
--- a/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/c43ebd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_c43ebd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = smoothstep_c43ebd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.glsl
index 61d3e0f..c79e144 100644
--- a/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/072192.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_072192();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl
index f44d705..3ac58ba 100644
--- a/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_20c74e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_20c74e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.glsl
index ab7c021..de29645 100644
--- a/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/4ac2c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_4ac2c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.glsl
index 43606b0..3438dc9 100644
--- a/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/803d1c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_803d1c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_803d1c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.glsl
index 3bbbe5c..76ab297 100644
--- a/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/895a0c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_895a0c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_895a0c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl
index da3fe61..1e4f059 100644
--- a/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_8c7024();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_8c7024();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.glsl
index e0374c4..8ea1cfe 100644
--- a/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/8da177.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_8da177();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.glsl
index 7d2dc0f..3778fcb 100644
--- a/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/9c5cbe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_9c5cbe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl
index 406c016..c0f4bc3 100644
--- a/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_aa0d7a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_aa0d7a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.glsl
index d164283..88060ed 100644
--- a/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/d9ab4d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_d9ab4d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_d9ab4d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.glsl
index ab65ff3..7c94c87 100644
--- a/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/ec33e9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_ec33e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_ec33e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl
index 1a0ec1e..39d0b90 100644
--- a/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_f8c59a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_f8c59a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.glsl
index d036c33..84520d2 100644
--- a/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/07cb06.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_07cb06();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_07cb06();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl
index 1546c4b..6e7a98a 100644
--- a/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_0b073b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_0b073b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl
index f4c9af1..12ba5c0 100644
--- a/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_19accd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_19accd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl
index c089d35..1200453 100644
--- a/test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_334303();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_334303();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.glsl
index 66bfb65..b4c0d00 100644
--- a/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/38cd79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_38cd79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/step/415879.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/415879.wgsl.expected.glsl
index 92bd5f7..61d0f73 100644
--- a/test/tint/builtins/gen/literal/step/415879.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/415879.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_415879();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.glsl
index 57d3bc1..0ce4a07 100644
--- a/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/630d07.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_630d07();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_630d07();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.glsl
index a839fbb..32d19a7 100644
--- a/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/7c7e5c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_7c7e5c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.glsl
index cd67cf6..ed76c6c 100644
--- a/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/baa320.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_baa320();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_baa320();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.glsl
index 6beaabd..5c90b05 100644
--- a/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/cc6b61.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_cc6b61();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_cc6b61();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl
index 2781632..64e7b74 100644
--- a/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_e2b337();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_e2b337();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.glsl
index 696679e..ae0f7ae 100644
--- a/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/step/f9b70c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_f9b70c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl
index 846b3d0..9d894c5 100644
--- a/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_244e2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_244e2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl
index d18b635..aa0b686 100644
--- a/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_2f030e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_2f030e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.glsl
index eed62d1..37e8423 100644
--- a/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/311400.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.55740773677825927734f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_311400();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.glsl
index cb4bf1a..21d7ae4 100644
--- a/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/539e54.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_539e54();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_539e54();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.glsl
index c31a17a..e4dd2b2 100644
--- a/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/7be368.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_7be368();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl
index 71333be..398aec5 100644
--- a/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_7ea104();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_7ea104();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl
index 3c67812..b0bf81c 100644
--- a/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_8ce3e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_8ce3e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.glsl
index c99b648..b50a42c 100644
--- a/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/9f7c9c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_9f7c9c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_9f7c9c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.glsl
index 1d37b21..247f641 100644
--- a/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/a0966f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_a0966f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.glsl
index eec275a..e73d30f 100644
--- a/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/ae26ae.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_ae26ae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.glsl
index a84f004..382742c 100644
--- a/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/d4d491.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_d4d491();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_d4d491();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.glsl
index 2836290..9184ed2 100644
--- a/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tan/db0456.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_db0456();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_db0456();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.glsl
index e29eb24..1e91382 100644
--- a/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/06a4fe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_06a4fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_06a4fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.glsl
index 6f39f1b..22469fd 100644
--- a/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/313aa1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.76159417629241943359f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_313aa1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl
index 21c67cc..09dfcb0 100644
--- a/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5663c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5663c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl
index e02cfe1..eac060d 100644
--- a/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5724b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5724b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.glsl
index 88c4654..4fb8f32 100644
--- a/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/5b19af.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5b19af();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5b19af();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.glsl
index 188634b..f0d49e1 100644
--- a/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/6289fd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_6289fd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.glsl
index 2406ed7..831c18b 100644
--- a/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/6d105a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_6d105a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_6d105a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl
index f532a6d..9fb4a77 100644
--- a/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_9f9fb9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_9f9fb9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.glsl
index d3e3dbd..2093a75 100644
--- a/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/ac5d33.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_ac5d33();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl
index 9b00491..2af78cb 100644
--- a/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_c15fdb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_c15fdb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.glsl
index 3fc4723..1f8677a 100644
--- a/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/c48aa6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_c48aa6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.glsl
index 72f957a..b3f0de6 100644
--- a/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/tanh/e8efb3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_e8efb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_e8efb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.glsl
index 0492c12..8cc7c37 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/00229f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_00229f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_00229f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.glsl
index 88bc07f..0636e9c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/00348c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_00348c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_00348c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
index 863b5b3..5eec82c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_022903();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_022903();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.glsl
index 2c0ad91..92f46fd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0329b0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0329b0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_0329b0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.glsl
index 4f27ccb..d1725df 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/033ea7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_033ea7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_033ea7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.glsl
index 0a03fea..0f5705c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/07f1ba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_07f1ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_07f1ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.glsl
index 9da16a5..6bdae63 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/088918.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_088918();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_088918();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
index 6688000..b8c7466 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0890c6.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0890c6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_0890c6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.glsl
index 8cc9800..37af870 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/08e371.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_08e371();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_08e371();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.glsl
index c7ae652..47feb85 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0d4a7c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0d4a7c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_0d4a7c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
index 6dd3774..a9edfd3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0ff9a4.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0ff9a4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_0ff9a4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.glsl
index 89c9a31..fd08006 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/135176.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_135176();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_135176();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
index 6b73e8d..858dd2c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/13f8db.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_13f8db();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_13f8db();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
index eef2a18..20c3cf5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/15b577.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_15b577();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_15b577();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.glsl
index dd774f4..0abd398 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1a2be7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1a2be7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_1a2be7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.glsl
index 08845e3..c170fd7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1b720f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1b720f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_1b720f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
index 422bbd7..edefebb 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bc428.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1bc428();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_1bc428();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
index f58e8d7..91ff2d0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1bd78c.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1bd78c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_1bd78c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.glsl
index bcb329a..2fbaea9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/212362.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_212362();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_212362();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
index a42fc28..ab959f3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/22b5b6.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_22b5b6();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_22b5b6();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.glsl
index 81cd0c9..b80d418 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/24db07.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_24db07();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_24db07();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.glsl
index e885163..d5bb08d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/268ddb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_268ddb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_268ddb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl
index 4b11504..090d1c1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_26d6bf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_26d6bf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.glsl
index 9357dae..1052872 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/284c27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_284c27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_284c27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.glsl
index a9b03e0..d273561 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2bafdf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2bafdf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2bafdf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.glsl
index 913de0b..041c47a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2dc5c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2dc5c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2dc5c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
index 4c78a32..e55463c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2e443d.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2e443d();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_2e443d();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
index 84e8c1f..0a78b02 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2fd2a4.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2fd2a4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_2fd2a4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.glsl
index 1ceb084..5fde98d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2ff32a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2ff32a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2ff32a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.glsl
index f44927e..21daa70 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/305dd5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_305dd5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_305dd5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
index dc8907c..ab0c085 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/346fee.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCubeArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_346fee();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_346fee();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
index 26aacd8..786810b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/382b16.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_382b16();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_382b16();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
index c4aa417..fd2d777 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3963d0.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCubeArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3963d0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_3963d0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.glsl
index c868830..f70f266 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/397dab.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_397dab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_397dab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.glsl
index ef25dc2..68008c0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3b38f6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3b38f6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3b38f6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
index b00f0a1..420854f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3c66f0.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3c66f0();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_3c66f0();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.glsl
index a9e4629..2e05867 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3f3474.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3f3474();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3f3474();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
index 3ad4ad8..ec87f6b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3fc3dc.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3fc3dc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_3fc3dc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.glsl
index 8e30728..ae0c10b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3ff0a5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3ff0a5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3ff0a5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.glsl
index cc13068..b5c25db 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/40da20.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_40da20();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_40da20();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.glsl
index 35565a0..4c4fb88 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/423519.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_423519();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_423519();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.glsl
index 74aedfb..a50fe60 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/445376.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_445376();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_445376();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.glsl
index 8646e8e..a29878c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/46f0fc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_46f0fc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_46f0fc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.glsl
index 5435217..9c7504b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4716a4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4716a4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4716a4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.glsl
index 3b932a2..2cd75f9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/475c10.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_475c10();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_475c10();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
index cae17b1..cc9795f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/49a067.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_49a067();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_49a067();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.glsl
index 0080ab8..7ee7218 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4be71b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4be71b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4be71b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.glsl
index 16d847a..ba0a4df 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4d1f71.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4d1f71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4d1f71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
index dafd338..0819cd2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/528c0e.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_528c0e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_528c0e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.glsl
index 1bc9641..1f62c41 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/52cf60.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_52cf60();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_52cf60();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.glsl
index 49b95a8..00fdd65 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/534ef8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_534ef8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_534ef8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl
index 473f4b6..ee421f9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_5df042();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_5df042();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.glsl
index 1b85c7d..eb4ca11 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/609d34.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_609d34();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_609d34();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.glsl
index 56dfff1..9bc9b80 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/62cb5a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_62cb5a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_62cb5a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.glsl
index 4e5748d..2b65648 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/62e7ae.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_62e7ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_62e7ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
index 09b93e4..bc1cde4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/64dc74.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCube arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_64dc74();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_64dc74();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.glsl
index 55eaae9..3219138 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6dae40.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6dae40();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6dae40();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.glsl
index f864f2b..a73bf70 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6dbef4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6dbef4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6dbef4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
index 71c82a0..2c2ecc3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6e6c7a.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6e6c7a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_6e6c7a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.glsl
index e8f9fa0..84ca61d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6e72c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6e72c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6e72c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
index 5522485..3bf2202 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6f1b5d.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6f1b5d();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_6f1b5d();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.glsl
index c200fde..160b073 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/709357.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_709357();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_709357();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.glsl
index cb663cc..aa7e4b2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7327fa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7327fa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7327fa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
index c5b3432..61401b6 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/756031.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_756031();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_756031();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.glsl
index 2ffbc87..d504b02 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/790e57.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_790e57();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_790e57();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.glsl
index 18a1624..acd0640 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/797c30.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_797c30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_797c30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
index 2e4b9ad..3592112 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/79d168.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_79d168();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_79d168();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.glsl
index e97f274..8bd3e16 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7a3890.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7a3890();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7a3890();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.glsl
index 5fa987c..660ae16 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7a9e30.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7a9e30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7a9e30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.glsl
index 4b4da52..97f6cbd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7c753b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7c753b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7c753b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.glsl
index a0505fe..e543cc7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7d8439.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7d8439();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7d8439();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.glsl
index f052fca..7ded2bc 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7edb05.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7edb05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7edb05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.glsl
index 4fb8b53..0e776c7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8057cb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8057cb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8057cb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.glsl
index 1009211..d628e83 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/841ebe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_841ebe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_841ebe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.glsl
index 9deb858..c203999 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/879b73.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_879b73();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_879b73();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.glsl
index 796cae4..3dc9efe 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/87b42d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_87b42d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_87b42d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.glsl
index dd3a559..8deb497 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/881dd4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_881dd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_881dd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.glsl
index 9c0f377..463ceb5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8af728.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8af728();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8af728();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.glsl
index 9d554d8..251849c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8e15f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8e15f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8e15f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.glsl
index e672cf0..1c5467b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8e5de6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8e5de6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8e5de6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.glsl
index 0fe0d75..1c7474d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/904b0f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_904b0f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_904b0f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
index a942d8d..0d81674 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_920006();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_920006();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl
index 962acd1..b7731d2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_965645();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_965645();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.glsl
index 3abbd13..5bc36a9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/98b2d3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_98b2d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_98b2d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
index 51da00e..b125a4c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/991ea9.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_991ea9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_991ea9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.glsl
index 6d4e1b1..a37deaf 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9b10a0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9b10a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9b10a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.glsl
index b69d99c..01c788d 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9b223b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9b223b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9b223b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
index 5fc1c81..50590c7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9baf27.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCube arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9baf27();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_9baf27();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
index d8aead1..0f0c79f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9c7a00();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_9c7a00();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
index 3cde1ff..ae2bf18 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9cd4ca.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9cd4ca();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_9cd4ca();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.glsl
index 29e0b28..4e4620d0 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9d0bac.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9d0bac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9d0bac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.glsl
index 2c723bc..fb14dc9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9d68b8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9d68b8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9d68b8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.glsl
index bce519f..2844c69 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9dc27a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9dc27a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9dc27a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
index efce23d..db460e8 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9e0794.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9e0794();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_9e0794();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.glsl
index 7d03264..2cf9af5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9fcc3b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9fcc3b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9fcc3b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.glsl
index 415fffd..fda6075 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a1598a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a1598a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a1598a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.glsl
index d342034..4a7255f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a25d9b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a25d9b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a25d9b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
index 1ae8062..ca3fbe2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a2ba5e.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a2ba5e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_a2ba5e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.glsl
index a69aa77..46f85bd 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a3ea91.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a3ea91();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a3ea91();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
index aadc81b..3e60da4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a48049.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a48049();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_a48049();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.glsl
index e1f3eef..19e6203 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a4cd56.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a4cd56();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a4cd56();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.glsl
index 52049ed..331d072 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a65776.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a65776();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a65776();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
index 09bae01..c96669b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_aac604();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_aac604();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
index 2f7c7b3..f81ae6c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3ab5e.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b3ab5e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_b3ab5e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
index f7a89d4..3e305a2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b46d97();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_b46d97();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.glsl
index 96fb2c0..72a91d5 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b56112.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b56112();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b56112();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.glsl
index e467316..62695e3 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b5ba03.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b5ba03();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b5ba03();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.glsl
index 705645b..d443a6c 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b6bbf4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b6bbf4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b6bbf4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.glsl
index 3ed49a2..24428d1 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b9e7ef.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b9e7ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b9e7ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.glsl
index 7f78588..1dd66f2 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bb95d9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bb95d9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bb95d9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
index deb0b8f..f27212b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bd94c8.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bd94c8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_bd94c8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.glsl
index a4bd89e..b5f6a58 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bec716.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bec716();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bec716();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.glsl
index ef12451..d7a1c15 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bf9170.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bf9170();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bf9170();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.glsl
index 2ac752a..65f99da 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c1189e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c1189e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c1189e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.glsl
index 4099515..92ec011 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c2cdd3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c2cdd3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c2cdd3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.glsl
index c4ef881..4d21b12 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c5a36e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c5a36e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c5a36e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
index 5ad6893..295a289 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c871f3.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c871f3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_c871f3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.glsl
index cb50b64..8b57229 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cd3033.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cd3033();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_cd3033();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.glsl
index 9da6126..087c000 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cdc6c9.wgsl.expected.glsl
@@ -253,16 +253,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cdc6c9();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureDimensions_cdc6c9();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.glsl
index 671343c..ff4fbf9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cedabd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cedabd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_cedabd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
index 9409a30..3e8a1bf 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cf2b50.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cf2b50();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_cf2b50();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.glsl
index 0d7cf7f..adbaf99 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d0778e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d0778e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d0778e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
index 64987ba..086ab37 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d3accd.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d3accd();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_d3accd();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.glsl
index 7f550c6..abcb84e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d44ac3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d44ac3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d44ac3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.glsl
index a9fe1d2..33f4f95 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d44dd1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d44dd1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d44dd1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.glsl
index 60dff6a..386a522 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d6f3cf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d6f3cf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d6f3cf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.glsl
index bc00c99..ffe693b 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/daf0fe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_daf0fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_daf0fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.glsl
index b67f686..b5e538a 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/db7131.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_db7131();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_db7131();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.glsl
index 0f7b541..2a6606e 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/de03c6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_de03c6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_de03c6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
index 242c063..1d72562 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/dfdc32.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_dfdc32();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_dfdc32();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
index 91b97d8..3681e20 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e18a8b.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e18a8b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_e18a8b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.glsl
index b9ba19c..bed37e8 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e4bfd2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e4bfd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_e4bfd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
index 821dc49..4980510 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e4e310.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e4e310();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_e4e310();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
index 7dca3f3..9d1ab19 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e5a203.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e5a203();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_e5a203();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
index e834c37..01642b4 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/eafe19.wgsl.expected.glsl
@@ -69,7 +69,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -79,16 +79,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_eafe19();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_eafe19();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
index ec8f53c..b99cdb6 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f17acd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_f17acd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.glsl
index fc23659..19a3bb7 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f4321c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f4321c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f4321c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.glsl
index d4898e9..e467a81 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f48886.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f48886();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f48886();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.glsl
index 07e88c4..2f9de29 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f626b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f626b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f626b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.glsl
index 5a55770..24347c9 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f7bac5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f7bac5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f7bac5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.glsl
index 2e27331..34280da 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f8522e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f8522e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f8522e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.glsl
index d1e7135..d344c22 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fdbae8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_fdbae8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_fdbae8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
index 18e8f43..1d4b90f 100644
--- a/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fdf6e9.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_fdf6e9();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_fdf6e9();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.glsl
index 3bfd950..f8cdaa5 100644
--- a/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/0166ec.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_0166ec();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_0166ec();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.glsl
index 84242e4..1bd8179 100644
--- a/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/04fa78.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_04fa78();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_04fa78();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl
index 4d18b01..21a906a 100644
--- a/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_10c554();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_10c554();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.glsl
index a8260aa..7325500 100644
--- a/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/11b2db.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_11b2db();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_11b2db();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.glsl
index 737f7bd..d63702f 100644
--- a/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/17baac.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_17baac();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_17baac();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.glsl
index 958125a..6900743 100644
--- a/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/1bf0ab.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_1bf0ab();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_1bf0ab();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.glsl
index f8df728..6b03a7c 100644
--- a/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/1f7f6b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_1f7f6b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_1f7f6b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.glsl
index 5086497..0114918 100644
--- a/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/22e930.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_22e930();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_22e930();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.glsl
index d8162a6..03f03b7 100644
--- a/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/238ec4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_238ec4();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_238ec4();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.glsl
index 0b49324..d17b749 100644
--- a/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/24b0bd.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_24b0bd();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_24b0bd();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.glsl
index f91bacb..f3646ab 100644
--- a/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/269250.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_269250();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_269250();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.glsl
index 5f1e2a0..74a0670 100644
--- a/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/2a4f40.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2a4f40();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_2a4f40();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.glsl
index bcd6b4d..455bce1 100644
--- a/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/2cc066.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2cc066();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_2cc066();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl
index 5db28ee..a6de392 100644
--- a/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2e0ed5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_2e0ed5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.glsl
index 139c993..1c51d99 100644
--- a/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/32c4e8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_32c4e8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_32c4e8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.glsl
index 0fa679b..2a7a803 100644
--- a/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/3b32cc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_3b32cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_3b32cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
index 5e6e000..9cff0f8 100644
--- a/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_43025d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_43025d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.glsl
index 5f60920..c217ab2 100644
--- a/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/445793.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_445793();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_445793();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.glsl
index 700e120..e95ed47 100644
--- a/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/49b07f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_49b07f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_49b07f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.glsl
index 42596f0..3fd0fd6 100644
--- a/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/4b8103.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_4b8103();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_4b8103();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.glsl
index 4a9d781..e73dcda 100644
--- a/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/4e8ac5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_4e8ac5();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_4e8ac5();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.glsl
index a0609da..58006b1 100644
--- a/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/5266da.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5266da();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_5266da();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.glsl
index 0c01e60..1472d19 100644
--- a/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/59372a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_59372a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_59372a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.glsl
index 1041633..3d77050 100644
--- a/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/5ba85f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5ba85f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_5ba85f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.glsl
index 56890ba..00f604f 100644
--- a/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/5bd491.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5bd491();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_5bd491();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.glsl
index f28bd30..60891c4 100644
--- a/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/6b7b74.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_6b7b74();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_6b7b74();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.glsl
index 9a68cad..1eb2cef 100644
--- a/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/751f8a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_751f8a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_751f8a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.glsl
index 1ced1b0..4d10dd9 100644
--- a/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/788010.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_788010();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_788010();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.glsl
index 77e8a6a..cf3a4b6 100644
--- a/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/7c3828.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_7c3828();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_7c3828();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.glsl
index 30e7924..4091aeb 100644
--- a/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/7dd226.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_7dd226();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_7dd226();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.glsl
index 83904bb..79353f6 100644
--- a/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/829357.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_829357();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_829357();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.glsl
index 59e049d..9176ef3 100644
--- a/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/831549.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_831549();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_831549();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.glsl
index 633d7f9..144c1e2 100644
--- a/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/8578bc.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8578bc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_8578bc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.glsl
index d9247b0..80282a9 100644
--- a/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/89680f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_89680f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_89680f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.glsl
index fa93adb..023fd8a 100644
--- a/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/8b754c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8b754c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_8b754c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.glsl
index ecbd035..24fe893 100644
--- a/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/8fae00.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8fae00();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_8fae00();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.glsl
index 79e7915..6a8b84d 100644
--- a/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/92ea47.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_92ea47();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_92ea47();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.glsl
index af650a5..1939585 100644
--- a/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/986700.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_986700();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_986700();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl
index 9a5ff0f..e98082f 100644
--- a/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_9a6358();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_9a6358();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.glsl
index 9c63d80..0aa1d28 100644
--- a/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/9ab41e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_9ab41e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_9ab41e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.glsl
index 46b776d..a5335f7 100644
--- a/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/a0372b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_a0372b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_a0372b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.glsl
index a9d9329..9bb13bb 100644
--- a/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/a68027.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_a68027();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_a68027();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.glsl
index 8322208..e9bc594 100644
--- a/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/aaf6bd.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_aaf6bd();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_aaf6bd();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.glsl
index 20a90ac..2abd1d8 100644
--- a/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/af55b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_af55b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_af55b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.glsl
index 8cb606a..1c8a88e 100644
--- a/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/bb3ac5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_bb3ac5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_bb3ac5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.glsl
index 64e6f4a..6f52bf6 100644
--- a/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/bd33b6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_bd33b6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_bd33b6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.glsl
index 81d4ef2..d919364 100644
--- a/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/be276f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_be276f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_be276f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.glsl
index 6b1de32..2fb65d4 100644
--- a/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/c0640c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_c0640c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_c0640c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.glsl
index 05590f8..6b59453 100644
--- a/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/ccadde.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ccadde();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_ccadde();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.glsl
index f11b130..2114165 100644
--- a/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/ce5578.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ce5578();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_ce5578();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.glsl
index e5d1c6e..e18bdd3 100644
--- a/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/cf9112.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_cf9112();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_cf9112();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.glsl
index 07fdd01..196f233 100644
--- a/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d1f187.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d1f187();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d1f187();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.glsl
index 1d60391..907a566 100644
--- a/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d4b5c6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d4b5c6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d4b5c6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.glsl
index 2d49bfa..468966d 100644
--- a/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d6507c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d6507c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_d6507c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.glsl
index 4a20026..6b1952d 100644
--- a/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d8e958.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d8e958();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_d8e958();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.glsl
index bc6d0af..1aa9829 100644
--- a/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d90605.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d90605();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_d90605();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.glsl
index 9dbbbd8..49adf98 100644
--- a/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/d98d59.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d98d59();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d98d59();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.glsl
index 1fc58c6..91d798b 100644
--- a/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/dc6661.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_dc6661();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_dc6661();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.glsl
index e1e7e88..2c0a690 100644
--- a/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/e2acac.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e2acac();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_e2acac();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.glsl
index 970c56c..3936b0c 100644
--- a/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/e3165f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e3165f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_e3165f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.glsl
index 3954465..7f3af87 100644
--- a/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/e9d390.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e9d390();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_e9d390();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.glsl
index 2a2a980..53ea587 100644
--- a/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/ea8eb4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ea8eb4();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_ea8eb4();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.glsl
index 1ae6c8c..d36f91a 100644
--- a/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/f2c6e3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_f2c6e3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_f2c6e3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.glsl
index 43f6483..3263a40 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/144a9a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_144a9a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_144a9a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl
index a506c13..0e88a32 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_182fd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_182fd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.glsl
index fb4d6b2..95903bd 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/2e409c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_2e409c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_2e409c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.glsl
index a714288..97983d0 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/313add.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_313add();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_313add();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
index 9dd1847..9881182 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_60d2d1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_60d2d1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl
index 63a7fe1..0737159 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_6d9352();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_6d9352();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl
index 88054e9..5744967 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_783e65();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_783e65();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.glsl
index a3b00f4..88b8680 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/b5bc43.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_b5bc43();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_b5bc43();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.glsl
index d0c0f72..8b47755 100644
--- a/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/f585cc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_f585cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_f585cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
index d07ae75..43f4a82 100644
--- a/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/019da0.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_019da0();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_019da0();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
index a76107a..4a98584 100644
--- a/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/026217.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_026217();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_026217();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.glsl
index 15d18f9..d5e4869 100644
--- a/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/045ec9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_045ec9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_045ec9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
index 861fd7b..551cc35 100644
--- a/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/04b911.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_04b911();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), 0.0f);
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_04b911();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.glsl
index 8d54894..08a7f6d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/050c33.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_050c33();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_050c33();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.glsl
index 0e66ff9..16f3512 100644
--- a/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/0674b1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_0674b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_0674b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.glsl
index de7d023..42d830c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/06ac37.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_06ac37();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_06ac37();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.glsl
index 7a82b76..162e557 100644
--- a/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/072e26.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_072e26();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_072e26();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.glsl
index 8aa9d2f..69b7ec4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/078bc4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_078bc4();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_078bc4();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
index 23719fc..03cdd36 100644
--- a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_0cb698();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_0cb698();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.glsl
index 6aa87a7..0e503f5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/10db82.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_10db82();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_10db82();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.glsl
index 715bd43..1a15405 100644
--- a/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/127e12.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_127e12();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_127e12();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
index 970a7a0..b7f35ad 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1373dc();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_1373dc();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.glsl
index 700a799..c135294 100644
--- a/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/13d539.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_13d539();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_13d539();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.glsl
index 36723af..1586f10 100644
--- a/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/13e90c.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_13e90c();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_13e90c();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.glsl
index 9b71c97..6ef6b2a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/143d84.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_143d84();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_143d84();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.glsl
index f521f66..b6781a9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1471b8.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1471b8();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_1471b8();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.glsl
index faa90ae..5d08aa4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1561a7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1561a7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_1561a7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.glsl
index e3ef6a8..6c45a5d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/15e675.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_15e675();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_15e675();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
index fb94e14..fc5b372 100644
--- a/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/168dc8.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_168dc8();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_168dc8();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.glsl
index 8f23f86..78f9e0a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/18ac11.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_18ac11();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_18ac11();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
index 79e1783..6a26273 100644
--- a/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_19cf87();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0.0f);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_19cf87();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.glsl
index 6c7b7d7..8b3203f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/19e5ca.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_19e5ca();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_19e5ca();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.glsl
index 32a9d02..ad0058e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1a062f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1a062f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_1a062f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.glsl
index 2e23d47..57eac8d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1a8452.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1a8452();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_1a8452();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.glsl
index d26d976..baf45e5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1aa950.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1aa950();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_1aa950();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
index 580a38a..178866c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b051f.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1b051f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_1b051f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
index 4aa27ef..4c819ea 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1b8588();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_1b8588();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.glsl
index 56a6fb7..728cc12 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1bfdfb.wgsl.expected.glsl
@@ -346,16 +346,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1bfdfb();
-  return tint_symbol;
+  VertexOutput v_17 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_17.pos = vec4(0.0f);
+  v_17.prevent_dce = textureLoad_1bfdfb();
+  return v_17;
 }
 void main() {
-  VertexOutput v_17 = vertex_main_inner();
-  gl_Position = v_17.pos;
+  VertexOutput v_18 = vertex_main_inner();
+  gl_Position = v_18.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_17.prevent_dce;
+  tint_interstage_location0 = v_18.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
index 21304f7..278eb6b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1c562a.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1c562a();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_1c562a();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.glsl
index ef4f23c..500f5803 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1eb93f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1eb93f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_1eb93f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
index b52e106..ab17eb9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1f2016();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_1f2016();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.glsl
index 3e1e957..0b4b4be 100644
--- a/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/206a08.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_206a08();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_206a08();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.glsl
index 2af8406..a1f1c1f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/20fa2f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_20fa2f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_20fa2f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
index f2dca19..f5314f8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_216c37();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_216c37();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
index e3b1a9c..712c52c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/21d1c4.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_21d1c4();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_21d1c4();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
index d45a63b..527fe9e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/223246.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_223246();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_223246();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.glsl
index 0164713..6162b89 100644
--- a/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/22e963.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_22e963();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_22e963();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.glsl
index 347c768..a1dd062 100644
--- a/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/23007a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_23007a();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_23007a();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
index 001b097..777e722 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2363be.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2363be();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_2363be();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.glsl
index 66ef552..fa73c7d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/23ff89.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_23ff89();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_23ff89();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.glsl
index 445a08b..a6203ba 100644
--- a/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/26c4f8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_26c4f8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_26c4f8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.glsl
index b12de01..4f8132d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/26d7f1.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_26d7f1();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_26d7f1();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.glsl
index 6813749..888aed6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/276643.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_276643();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_276643();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.glsl
index d569386..5417bca 100644
--- a/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/276a2c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_276a2c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_276a2c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.glsl
index 53c7526..183fdc6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2887d7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2887d7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_2887d7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.glsl
index 2996ce1..cfb30a6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2a82d9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2a82d9();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_2a82d9();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.glsl
index cc6c89e..a228dea 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2ae485.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2ae485();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_2ae485();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.glsl
index e8d55ed..2f2c156 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2c72ae.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2c72ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_2c72ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
index 1fd46e3..814703d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2d479c.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2d479c();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_2d479c();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.glsl
index a14fb47..8e882be 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2d6cf7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2d6cf7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_2d6cf7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.glsl
index 5753cd9..d665bdf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2e09aa.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2e09aa();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_2e09aa();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.glsl
index 7278799..050bcf8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/2e3552.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2e3552();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_2e3552();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.glsl
index 89675ad..522d6d6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/313c73.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_313c73();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_313c73();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.glsl
index 2ae768e..82349e0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/31db4b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_31db4b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_31db4b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.glsl
index f409176..417c3c0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/321210.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_321210();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_321210();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.glsl
index 9ddaf87..1eb590b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/33d3aa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_33d3aa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_33d3aa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.glsl
index f7b7377..3b809ca 100644
--- a/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/348827.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_348827();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_348827();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.glsl
index ab4425c..7aa7ee1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/35d464.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_35d464();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_35d464();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.glsl
index b4957ae..cbbbf04 100644
--- a/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/374351.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_374351();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_374351();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.glsl
index 92be774..b24c575 100644
--- a/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/388688.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_388688();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_388688();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.glsl
index 5b4687c..ab658da 100644
--- a/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/38f8ab.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_38f8ab();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_38f8ab();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.glsl
index fede61c..ef8d7c8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/39ef40.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_39ef40();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_39ef40();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.glsl
index f88db56..99e4c3b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3c0d9e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c0d9e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_3c0d9e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.glsl
index 0ae57e5..09fc68f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3c9587.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c9587();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_3c9587();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
index 87d03f9..d9c53c1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3c96e8.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c96e8();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_3c96e8();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.glsl
index be5221d..ab34d76 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3d001b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d001b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_3d001b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
index 9d1a003..62f3dfc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3d3fd1.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d3fd1();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_3d3fd1();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.glsl
index 19ca44f..e824422 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3d9c90.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d9c90();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_3d9c90();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
index 0a2b8f3..be2cedc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3da3ed();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_3da3ed();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.glsl
index 6b11275..aaf3132 100644
--- a/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/3e5f6a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3e5f6a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_3e5f6a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
index 35af224..8a46a20 100644
--- a/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/439e2a.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_439e2a();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_439e2a();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.glsl
index 6ae13bc..97db1d5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/44c826.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_44c826();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_44c826();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.glsl
index 2bb06e2..849c3ec 100644
--- a/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/454347.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_454347();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_454347();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.glsl
index 70e6437..b1fc2b3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4638a0.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4638a0();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_4638a0();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
index 87caa61..28f5ace 100644
--- a/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/46a93f.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_46a93f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_46a93f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.glsl
index ba12ee5..1324eb3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/46dbf5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_46dbf5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_46dbf5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
index 730d996..394ba1d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/47e818.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_47e818();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_47e818();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
index bb4cf3f..b49eedc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_484344();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_484344();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.glsl
index f0452d0..797e1b3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4951bb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4951bb();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_4951bb();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.glsl
index 7172f29..8480c9a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/49f76f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_49f76f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_49f76f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
index 7ceab2a..b1c3039 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4acb64.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4acb64();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_4acb64();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
index e1a8990..6fb9c09 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4c423f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_4c423f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.glsl
index ae93301..94cfe03 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4c67be.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4c67be();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_4c67be();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.glsl
index 904c0ab..4b73d03 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4cdca5.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4cdca5();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_4cdca5();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.glsl
index d84439d..e43ce00 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4db25c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4db25c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_4db25c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.glsl
index 9e1e330..556379c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4fa6ae.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4fa6ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_4fa6ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
index f3d2bd9..9e02a61 100644
--- a/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4fd803();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_4fd803();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.glsl
index 9180bc3..50f4baf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/505aa2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_505aa2();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_505aa2();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.glsl
index 0d37123..b7bc5c2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/50915c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_50915c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_50915c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.glsl
index 3ec4da3..c82307d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/519ab5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_519ab5();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_519ab5();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.glsl
index 0f666cf..908a010 100644
--- a/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/53378a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_53378a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_53378a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
index bdee387..2e04a86 100644
--- a/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/53e142.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_53e142();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_53e142();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
index b72ffc7..17aaac5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/54a59b.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_54a59b();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_54a59b();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.glsl
index 546e00e..fb0e932 100644
--- a/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/54e0ce.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_54e0ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_54e0ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.glsl
index 87e7702..b5ba10e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/55e745.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_55e745();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_55e745();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.glsl
index 2a2eaf1..5808633 100644
--- a/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/560573.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_560573();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_560573();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.glsl
index a09571a..6b46575 100644
--- a/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/582015.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_582015();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_582015();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.glsl
index ee80ede..f0d6a30 100644
--- a/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/589eaa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_589eaa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_589eaa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
index e480381..20b19db 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5a2f9d();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_5a2f9d();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.glsl
index 6046929..be9700e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5abbf2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5abbf2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_5abbf2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.glsl
index 13967cb..2986406 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5bb7fb.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5bb7fb();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5bb7fb();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.glsl
index 8452b21..73de2a3 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5cee3b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5cee3b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_5cee3b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.glsl
index 557ac40..e2a7927 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5d0a2f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5d0a2f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_5d0a2f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.glsl
index 860cda5..3c0f5fc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5d4042.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5d4042();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_5d4042();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.glsl
index be81725..a588637 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5dd4c7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5dd4c7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5dd4c7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.glsl
index ab50e07..7ba71bc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5e8d3f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5e8d3f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_5e8d3f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.glsl
index 8559ece..4ffff19 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5ed6ad.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5ed6ad();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_5ed6ad();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.glsl
index a604276..34f903c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5f4473.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5f4473();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_5f4473();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.glsl
index 4816ffc..d4d4445 100644
--- a/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5feb4d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5feb4d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_5feb4d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
index b888929..1a1b39f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6154d4();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_6154d4();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.glsl
index 8d55796..eb3f46e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/620caa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_620caa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_620caa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl
index d4a33f2..554ec44 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6273b1();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_6273b1();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.glsl
index 07b1953..98a472a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/62d125.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_62d125();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_62d125();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
index bfc676d..ebc30ee 100644
--- a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_62d1de();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_62d1de();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.glsl
index c1b36cb..526bea9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/639962.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_639962();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_639962();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.glsl
index ffc1a9d..364e09b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/63be18.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_63be18();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_63be18();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
index cfad52f..d80d6d4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/656d76.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_656d76();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_656d76();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.glsl
index cf7a1c9..e2b563a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/65a4d0.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_65a4d0();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_65a4d0();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.glsl
index 3a384f7..53d83b2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6678b6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6678b6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_6678b6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
index 93b5a24..d0d15e0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/66be47.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_66be47();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), 0.0f);
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_66be47();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.glsl
index 8746c61..53cfffa 100644
--- a/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/67edca.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_67edca();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_67edca();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.glsl
index b7a83a3..8bf7b89 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6925bc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6925bc();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_6925bc();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
index e3e24b4..246acab 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6b77d4();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6b77d4();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
index 88884c9..9dc2d22 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6bf4b7.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6bf4b7();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6bf4b7();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
index e5f06f1..c3c8e43 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6d376a();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_6d376a();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.glsl
index def60d0..3c305e8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6f0370.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6f0370();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_6f0370();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.glsl
index c67f4b1..ba2339e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6f1750.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6f1750();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_6f1750();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
index 51bf9fa..10c92db 100644
--- a/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/714471.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_714471();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_714471();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.glsl
index 2e12c69..9558324 100644
--- a/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/72bb3c.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_72bb3c();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_72bb3c();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.glsl
index f6c19f2..d6f03ce 100644
--- a/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/749704.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_749704();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_749704();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.glsl
index 9b11573..4b3483e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/773c46.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_773c46();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_773c46();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
index dd6b379..7f29d11 100644
--- a/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/789045.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_789045();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_789045();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
index 8ee4969..2cee7b4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_79e697();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_79e697();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
index e47147f..d1057cb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7ab4df.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7ab4df();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_7ab4df();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
index 43679a1..6084f53 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7b63e0.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7b63e0();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0.0f);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_7b63e0();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.glsl
index 09ff6a9..44c877c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7bee94.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7bee94();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_7bee94();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
index 5024578..9661707 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7c90e5();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_7c90e5();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.glsl
index 45ee6ec..b25ffdd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7dab57.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7dab57();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_7dab57();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
index edda6c7..8ecdd3f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7fd822.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7fd822();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0.0f);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_7fd822();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
index 5032739..a431406 100644
--- a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_81c381();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_81c381();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.glsl
index 36171b2..0667853 100644
--- a/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/83162f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_83162f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_83162f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.glsl
index e111387..7d15e46 100644
--- a/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/83cea4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_83cea4();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_83cea4();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.glsl
index 7c19f72..911154c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/84c728.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_84c728();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_84c728();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
index 3ec1593..d86c9ea 100644
--- a/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/84dee1.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_84dee1();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_84dee1();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
index addba77..3fe8301 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8527b1.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8527b1();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_8527b1();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.glsl
index 4036faa..e3c2b45 100644
--- a/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/862833.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_862833();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_862833();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
index 78f35e9..9fb327d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_87be85();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_87be85();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.glsl
index b124f7a..6f13e32 100644
--- a/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/89620b.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_89620b();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_89620b();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
index f48e98e..792c2d2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/897cf3.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_897cf3();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_897cf3();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.glsl
index d44e560..984c709 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8a291b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8a291b();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_8a291b();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.glsl
index 06bd4ab..b2ae74f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8a9988.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8a9988();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_8a9988();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl
index d25bf4f..09a7227 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl
@@ -346,16 +346,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8acf41();
-  return tint_symbol;
+  VertexOutput v_17 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_17.pos = vec4(0.0f);
+  v_17.prevent_dce = textureLoad_8acf41();
+  return v_17;
 }
 void main() {
-  VertexOutput v_17 = vertex_main_inner();
-  gl_Position = v_17.pos;
+  VertexOutput v_18 = vertex_main_inner();
+  gl_Position = v_18.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_17.prevent_dce;
+  tint_interstage_location0 = v_18.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
index e22bd0d..af9b41a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8ccbe3.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8ccbe3();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0.0f);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_8ccbe3();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.glsl
index e63dd67..e468c9e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8db0ce.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8db0ce();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_8db0ce();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.glsl
index 692806a..3136241 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8e5032.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8e5032();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_8e5032();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.glsl
index 4405298..94a0109 100644
--- a/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8ff033.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8ff033();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_8ff033();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
index e1116ec..896fed1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/92eb1f.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_92eb1f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_92eb1f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.glsl
index b9f64fe..04cd736 100644
--- a/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/936952.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_936952();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_936952();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.glsl
index 9c884d7..3ba1f7b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/947107.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_947107();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_947107();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
index 1176b94..010ce2f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/96efd5.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_96efd5();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_96efd5();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.glsl
index 02d934d..e8d57f8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/970308.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_970308();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_970308();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
index 8b347b1..b01bdc2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9885b0.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9885b0();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9885b0();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.glsl
index de7a0cc..942324d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9a7c90.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9a7c90();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_9a7c90();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.glsl
index b1783aa..57e735a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9a8c1e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9a8c1e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9a8c1e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
index bfae9ac..0f75473 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9aa733.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9aa733();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_9aa733();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
index 541d470..bad589d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9b2667();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), 0.0f);
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_9b2667();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.glsl
index b48dd3f..da50924 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9b5343.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9b5343();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9b5343();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.glsl
index 6658a57..dbb8572 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9c2376.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9c2376();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9c2376();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.glsl
index 2b4c032..d34ff51 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9c2a14.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9c2a14();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_9c2a14();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.glsl
index b98b725..0b84302 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9cf7df.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9cf7df();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9cf7df();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
index 2cb3905..6ad39b5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9d70e9.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9d70e9();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_9d70e9();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.glsl
index a404216..accb729 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9de6f5.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9de6f5();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9de6f5();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
index 77916ef..90bd45f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9ed19e.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9ed19e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_9ed19e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
index 33cc43f..ab1077c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9fbfd9.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9fbfd9();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_9fbfd9();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.glsl
index 8388402..3a092e4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a03af1.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a03af1();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_a03af1();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
index 2b98506..0ffb21c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a24be1.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a24be1();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_a24be1();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl
index 087aa33..1ecf9cb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a583c9();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_a583c9();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.glsl
index fc53dec..b23de43 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a6a85a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a6a85a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_a6a85a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.glsl
index 993a28a..10ed68e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a6b61d.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a6b61d();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_a6b61d();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.glsl
index e7e4b02..d205eb1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a7444c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a7444c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_a7444c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.glsl
index 8c6f9e4..31f29a2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a7a3c3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a7a3c3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_a7a3c3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.glsl
index 7b1db8d..ae681e2 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a8549b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a8549b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_a8549b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
index 2887761..93264eb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a9a9f5();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_a9a9f5();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.glsl
index e83ebec..1a4b7ab 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/aa8a0d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aa8a0d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_aa8a0d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.glsl
index 4e34719..512aba1 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/aae7f6.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aae7f6();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_aae7f6();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.glsl
index 6701bec..d709469 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ac64f7.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ac64f7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_ac64f7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.glsl
index 8d2e849..5dff342 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/aeae73.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aeae73();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_aeae73();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.glsl
index c3f5efa..f1066c8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/aebc09.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aebc09();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_aebc09();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.glsl
index 2cc3aee..fdf527c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b1bf79.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b1bf79();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_b1bf79();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.glsl
index 7f9f488..011aebe 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b24d27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b24d27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_b24d27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
index 4765d0d..8dccf21 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b29f71.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b29f71();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_b29f71();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.glsl
index ecdfc0e..7c33fad 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b58c6d.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b58c6d();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_b58c6d();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
index 2305bb1f..97dd257 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b6ba5d.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b6ba5d();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), 0.0f);
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_b6ba5d();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.glsl
index 5ea1a93..9594c09 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b6c458.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b6c458();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_b6c458();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
index 9bced428..85014c5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b73f6b.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b73f6b();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_b73f6b();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.glsl
index e45ac76..ff5b074 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b75d4a.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b75d4a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_b75d4a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.glsl
index bc71998..188c9be 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b7f74f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b7f74f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_b7f74f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.glsl
index 553f44b..939a61c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b80e7e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b80e7e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_b80e7e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.glsl
index 8884b58..36ddf80 100644
--- a/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/b94d15.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b94d15();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_b94d15();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
index 28318c5..78170a8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bc3201();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_bc3201();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
index f1ed9ce..5cc4608 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/bcbb3c.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bcbb3c();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_bcbb3c();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.glsl
index 1651c61..66fdbe7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/bfd154.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bfd154();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_bfd154();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.glsl
index bfd0870..b94ab88 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c02b74.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c02b74();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c02b74();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.glsl
index 0acd3dd..0dfb53b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c07013.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c07013();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c07013();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
index 36d4fb3..ad13315 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c16e00.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c16e00();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), 0.0f);
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_c16e00();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.glsl
index 6e33350..10951d9 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c21b33.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c21b33();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_c21b33();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
index 15d5dd0..455ff17 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
@@ -77,7 +77,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -91,16 +91,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c2a480();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_c2a480();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl
index 393a6e7e..5eb54a8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c378ee();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c378ee();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.glsl
index 63da654..d3b936e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c40dcb.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c40dcb();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_c40dcb();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.glsl
index e845dd4..e56361a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c456bc.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c456bc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c456bc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.glsl
index ad768cb..e19de46 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c5791b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c5791b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_c5791b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.glsl
index 7504f24..80c0fdd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c66b20.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c66b20();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_c66b20();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.glsl
index 248625d..4a826a3b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c7cbed.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c7cbed();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c7cbed();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.glsl
index 9d8f9d5..c77d94a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c8ed19.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c8ed19();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c8ed19();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.glsl
index e986d49..f2b9ead 100644
--- a/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c9cc40.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c9cc40();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c9cc40();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.glsl
index 303ec06..d98c8a0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/cad5f2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cad5f2();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_cad5f2();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
index cb0528d..c9ffe63 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/cb57c2.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cb57c2();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), 0.0f);
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_cb57c2();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.glsl
index 6b082cf..de2666a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/cdd343.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cdd343();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_cdd343();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.glsl
index 174f511..999c705 100644
--- a/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/cece6c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cece6c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_cece6c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.glsl
index 3dd954a..16e0e16 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d02afc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d02afc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_d02afc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.glsl
index 8570c77..6fbd313 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d357bb.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d357bb();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d357bb();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.glsl
index 7508775..3d57529 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d4df19.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d4df19();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_d4df19();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.glsl
index acdbff1..b1820db 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d5c48d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d5c48d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d5c48d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.glsl
index ae8ae1b..296d1da 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d81c57.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d81c57();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d81c57();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.glsl
index 20dc460..9ec0512 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d85d61.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d85d61();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_d85d61();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.glsl
index f937bb2..711359b 100644
--- a/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/d8617f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d8617f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_d8617f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.glsl
index 7fc00a5..cdc1bff 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/dbd554.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dbd554();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_dbd554();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.glsl
index ce5b63c..951edd0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/dd8776.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dd8776();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_dd8776();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.glsl
index dec3a5e..c1e71f4 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ddeed3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ddeed3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_ddeed3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.glsl
index 626b828..13e6a0f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/dee8e7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dee8e7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_dee8e7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.glsl
index d65644c..a6ebf37 100644
--- a/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/dfdf3b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dfdf3b();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_dfdf3b();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.glsl
index 20217bb..c669002 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e2292f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e2292f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_e2292f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
index 73359cc..b552940 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e35f72.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e35f72();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_e35f72();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.glsl
index 5322277..0bbe977 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e3b08b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e3b08b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_e3b08b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl
index e2c2e2d..b18a19a 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e3d2cc();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_e3d2cc();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.glsl
index 0c2969e..4624b4c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e57e92.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e57e92();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_e57e92();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.glsl
index e07cfb4..097110e8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e59fdf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e59fdf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_e59fdf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.glsl
index 742a7b6..51b2adb 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e65916.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e65916();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e65916();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.glsl
index eb2b3c5..2e27acd 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e893d7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e893d7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e893d7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.glsl
index 854c9f8..e317075 100644
--- a/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e92dd0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e92dd0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_e92dd0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.glsl
index a49326e..cbdf669 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ea2abd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ea2abd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_ea2abd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.glsl
index a68c350..310331c 100644
--- a/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/eb573b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_eb573b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_eb573b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
index 236b4a2..b527562 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ebfb92.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ebfb92();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_ebfb92();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.glsl
index 880315a..00447c7 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ecc823.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ecc823();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_ecc823();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.glsl
index c5ba0a9..0b7d9d0 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ee33c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ee33c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_ee33c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.glsl
index 17d686b..19e4bf8 100644
--- a/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/eecf7d.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_eecf7d();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_eecf7d();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.glsl
index 49325d2..37646f6 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ef5405.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ef5405();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_ef5405();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.glsl
index 6d6d080..b6788cc 100644
--- a/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/efa787.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_efa787();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_efa787();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.glsl
index 2b909fc..4c3eaff 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f06b69.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f06b69();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f06b69();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.glsl
index 95e1ebf..2e5ebf5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f0abad.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f0abad();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f0abad();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.glsl
index 2e2edf4..056143f 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f2a7ff.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f2a7ff();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_f2a7ff();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
index 65bc172..e120168 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f348d9.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f348d9();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_f348d9();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.glsl
index 2a2b75f..1d934cf 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f35ac7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f35ac7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_f35ac7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.glsl
index 36f79e2..bff1693 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f379e2.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f379e2();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_f379e2();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.glsl
index a6c9ad9..28f961d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f56e6f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f56e6f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f56e6f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.glsl
index 0202829..2cae544 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f5aee2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f5aee2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_f5aee2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.glsl
index 1bbdee3..0a7d338 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f74bd8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f74bd8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f74bd8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.glsl
index 1863d17..6fcf868 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f7f936.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f7f936();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_f7f936();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
index 6045112..f416991 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f85291.wgsl.expected.glsl
@@ -75,7 +75,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -88,16 +88,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f85291();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_f85291();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.glsl
index 017e89a..b8f6552 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f8a2e8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f8a2e8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f8a2e8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.glsl
index b96b8ad..ea2d0a5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/f9eaaf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f9eaaf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_f9eaaf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.glsl
index 177b1e1..e4a2871 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fc6d36.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fc6d36();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_fc6d36();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.glsl
index 58631ab..81ca354 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fcd23d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fcd23d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_fcd23d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.glsl
index bef9199..4331d09 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fd6442.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fd6442();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureLoad_fd6442();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.glsl
index fcc7104..0bfa02d 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fdebd0.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fdebd0();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_fdebd0();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.glsl
index 6602ebc..2ec670e 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fe0565.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fe0565();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_fe0565();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.glsl
index 87c4b2c..1cffdd5 100644
--- a/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/fe222a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fe222a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_fe222a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.glsl
index 2c2d761..40ee920 100644
--- a/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/feab99.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_feab99();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_feab99();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
index 0eb6114..1492e18 100644
--- a/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/ff1119.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ff1119();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), 0.0f);
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = textureLoad_ff1119();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.glsl
index b5944a3..7425c03 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/0ec222.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_0ec222();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_0ec222();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.glsl
index 1ebb167..f0d8877 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/0fe8dc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_0fe8dc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_0fe8dc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.glsl
index 087e3fb..23a653f 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/26c9f9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_26c9f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_26c9f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.glsl
index 80c0ce7..9f9f1f4 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/2d95ea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_2d95ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_2d95ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.glsl
index 9a43dd4..31b2d09 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/34cefa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_34cefa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_34cefa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.glsl
index ea797b7..3659f41 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/379cc5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_379cc5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_379cc5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.glsl
index ab87cf3..2aa5252 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/3ad143.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_3ad143();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_3ad143();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.glsl
index 69c5f57..3094d9c 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/3eff89.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_3eff89();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_3eff89();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.glsl
index beb6508..a192c3b 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/485774.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_485774();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_485774();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.glsl
index 5f24ac6..2ad3b75 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/48ef47.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_48ef47();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_48ef47();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.glsl
index 94f7eeb..9b5e5a2 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/4adaad.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_4adaad();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_4adaad();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.glsl
index 24ba54a..2a8252c 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/52dfc5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_52dfc5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_52dfc5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.glsl
index e28a7c7..bcab8b4 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/555f67.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_555f67();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_555f67();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.glsl
index 5497a3f..26eda3b 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/59cc27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_59cc27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_59cc27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.glsl
index b6b3c12..507dcc8 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/5f20d1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_5f20d1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_5f20d1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.glsl
index f1125fe..a505d1e 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/6b4321.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_6b4321();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_6b4321();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.glsl
index 21ef448..da13e4f 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/77be7b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_77be7b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_77be7b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.glsl
index 3d487ba..d97306e 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/7895f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_7895f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_7895f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.glsl
index 65a97ef..ea27921 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/8ac32a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_8ac32a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_8ac32a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.glsl
index cec7758..d45b928 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/90b8cc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_90b8cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_90b8cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.glsl
index e2773e5..435e1fc 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/9c60e3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_9c60e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_9c60e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.glsl
index 6c51ce6..bb9540f 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/a9d3f5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_a9d3f5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_a9d3f5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.glsl
index 6939a94..f4febd1 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/bf2f76.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_bf2f76();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_bf2f76();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.glsl
index 38ac9b9..d489567 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/c1eca9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_c1eca9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_c1eca9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.glsl
index a0989c8..2d2730f5 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/d3e21f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_d3e21f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_d3e21f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.glsl
index d1c2fb1..624f70e 100644
--- a/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/f1783f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_f1783f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_f1783f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
index 0d815c8..1304abd 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/181090.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_181090();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_181090();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
index 1243ab6..838ae36 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a3fa9.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_1a3fa9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_1a3fa9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
index bc6117b..4d384b3 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_1a7fc3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_1a7fc3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
index 8cd1af2..68deb36 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2267d8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2267d8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2267d8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
index cf76141..1a29c87 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/24b2c6.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_24b2c6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_24b2c6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
index 339b716..8d31df0 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2bea6c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2bea6c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2bea6c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
index 993959f..feeb854 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2df1ab.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2df1ab();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2df1ab();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
index 9022767..3f9d2ab 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/46dbd8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_46dbd8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_46dbd8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
index ffa1a91..5884e60 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/60d9b8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_60d9b8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_60d9b8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
index 375ef75..8dc8372 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/903920.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_903920();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_903920();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
index c8c2abc..915c619 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/9a1a65.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_9a1a65();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_9a1a65();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
index 11ca594..1189e67 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/adc783.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_adc783();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_adc783();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
index 45437c3..ae95b74 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ae911c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_ae911c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_ae911c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
index 2e10a32..bd3076c 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c386c8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c386c8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c386c8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
index a826c08..838e24d 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c399f9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c399f9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
index 60fb1a7..5c9ba46 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/c8c25c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c8c25c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c8c25c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
index a80ac89..ac68e0c 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d63126.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_d63126();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_d63126();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
index 80af959..def457f 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d8f73b.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_d8f73b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_d8f73b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
index cd4d897..c319d7e 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ef7944.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_ef7944();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_ef7944();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
index a7f5a73..9ee8b10 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/efd6df.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_efd6df();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_efd6df();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
index 9446e07..09d7cb6 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_f742c0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_f742c0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
index b3165b9..c12eef7 100644
--- a/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/fe2171.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_fe2171();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_fe2171();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
index bebce6b..11cadf1 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/50f399.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_50f399();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_50f399();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
index 2dc50c5..368cf03 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/c1a777.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_c1a777();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_c1a777();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
index 0afde1a4..c596e62 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/dbb799.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_dbb799();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_dbb799();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
index 79ca71d..5bc8e8f 100644
--- a/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/ecd321.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_ecd321();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_ecd321();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
index 549aa90..7655c45 100644
--- a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
@@ -331,16 +331,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleBaseClampToEdge_7c04e6();
-  return tint_symbol;
+  VertexOutput v_12 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_12.pos = vec4(0.0f);
+  v_12.prevent_dce = textureSampleBaseClampToEdge_7c04e6();
+  return v_12;
 }
 void main() {
-  VertexOutput v_12 = vertex_main_inner();
-  gl_Position = v_12.pos;
+  VertexOutput v_13 = vertex_main_inner();
+  gl_Position = v_13.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_12.prevent_dce;
+  tint_interstage_location0 = v_13.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
index 5f9ef33..1674db0 100644
--- a/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleBaseClampToEdge_9ca02c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleBaseClampToEdge_9ca02c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
index 0e948bb..012e6d3 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_1116ed();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_1116ed();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
index d68820c..b450936 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_1568e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_1568e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
index 75ce9dc..3699f713 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_2ad2b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_2ad2b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
index c835da1..02e26bd 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_4cf3a2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_4cf3a2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
index 8ced9ec..f29774c 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_7dc3c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_7dc3c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
index 5730a49..a54b48b 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_7f2b9a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_7f2b9a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.glsl
index e2ec6e3..0f92664 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/958c87.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_958c87();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_958c87();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
index d340457..e19773b 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_b6e47c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_b6e47c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
index e3ea2e7..e50658c 100644
--- a/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_bcb3dd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_bcb3dd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl
index ed162d6..e70a594 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_21402b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_21402b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl
index 9d1a486..7c4e5c6 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_2ecd8f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_2ecd8f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl
index 1c3b278..100f68e 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_521263();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_521263();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl
index 0f06e56..8358a28 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_5312f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_5312f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.glsl
index 45ccafb..25e8f14 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/5884dd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_5884dd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_5884dd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.glsl
index eb78578..75cfb5f 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/7cd6de.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_7cd6de();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_7cd6de();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.glsl
index 0e21ba6..89b3396 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/a09131.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_a09131();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_a09131();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.glsl
index 49b3bcf..3b3f621 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/bbb58f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_bbb58f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_bbb58f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.glsl
index 443a191..66f7bf8 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/d4e3c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_d4e3c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_d4e3c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.glsl
index 0b92773..37dcbf6 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/d65515.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_d65515();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_d65515();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
index 5d3fea4..cff51fbe 100644
--- a/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_e383db();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_e383db();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl
index e31b275..4174421 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_02be59();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_02be59();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.glsl
index 5a30cd1..712d573 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0b0a1b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_0b0a1b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleLevel_0b0a1b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
index 1783352..66ca93d 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_0bdd9a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_0bdd9a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
index c7fd0fd..f7c7b71 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_1b0291();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_1b0291();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
index b331eea..4b70d88 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_1bf73e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_1bf73e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.glsl
index 5a67a37..7125f15 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/265cc7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_265cc7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_265cc7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.glsl
index 8864c9e..2bfd6c9 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/2974eb.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_2974eb();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_2974eb();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl
index 010d452..da7181a 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_302be4();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_302be4();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.glsl
index 088dcfa..ad74029 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/36780e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_36780e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_36780e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.glsl
index 55983eb..a47e8d4 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/36f0d3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_36f0d3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_36f0d3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.glsl
index 49a079e..60ad248 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/3c3442.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_3c3442();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_3c3442();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.glsl
index 697aa8f..7491032 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/615583.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_615583();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_615583();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.glsl
index 5384896..193aa7e 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/73e892.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_73e892();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_73e892();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.glsl
index 29454b1..e7536e2 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/749baf.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_749baf();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_749baf();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.glsl
index 5a3cce3..8ddfae7 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/941a53.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_941a53();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_941a53();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.glsl
index 628e9ac..95be624 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/a12142.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_a12142();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_a12142();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.glsl
index 04cc9d2..4ff721a 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/aab3b9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_aab3b9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_aab3b9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl
index 7c02bbb..ed885d1 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_abfcc0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleLevel_abfcc0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
index 47ab166..50e7844 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ae5e39();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_ae5e39();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.glsl
index c39d8e5..8583c58 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae92a2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ae92a2();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_ae92a2();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.glsl
index 00ef66f..b128fc8 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/b7c55c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_b7c55c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_b7c55c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl
index 014a760..c9f9f38 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_c32df7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleLevel_c32df7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl
index 2f5462e..8813910 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_c6aca6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleLevel_c6aca6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.glsl
index 537c9ea..c0c674a 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/cdfe0f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_cdfe0f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_cdfe0f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.glsl
index a2ab291..e52fb41 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/dcbecb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_dcbecb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleLevel_dcbecb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.glsl
index 8d5b2f1..238fa5c 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/e6ce9e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_e6ce9e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_e6ce9e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.glsl
index 156d253..d3fe99a 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/f3b2c8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_f3b2c8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_f3b2c8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.glsl
index d7ee6e9..5f6d69e 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/faa6d7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_faa6d7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_faa6d7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.glsl
index 51329dd..a79260a 100644
--- a/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ff11bc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ff11bc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0.0f);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_ff11bc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.glsl
index e09f80c..4102601 100644
--- a/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/06794e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_06794e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_06794e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl
index 82026eb..5f23f53 100644
--- a/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_2585cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_2585cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl
index c45ff44..cc6babe 100644
--- a/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_31d679();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_31d679();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl
index 67bba39..594ba8c 100644
--- a/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_31e37e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_31e37e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.glsl
index a7b7ae6..804c382 100644
--- a/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/32dd64.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4x3 res = mat4x3(vec3(1.0f), vec3(1.0f), vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_32dd64();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl
index dc219d4..d71df27 100644
--- a/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_4ce359();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_4ce359();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl
index a466fa4..a9d6ccc 100644
--- a/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_4dc9a1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_4dc9a1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.glsl
index 591449d..480ed6f 100644
--- a/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/553e90.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2x4 res = mat2x4(vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_553e90();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.glsl
index a8ef5f7..3955e5e 100644
--- a/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/5c133c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3x4 res = mat3x4(vec4(1.0f), vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_5c133c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.glsl
index a364d72..d30c352 100644
--- a/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/5edd96.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_5edd96();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_5edd96();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.glsl
index 99aa6f7..370b54f 100644
--- a/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/5f36bf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_5f36bf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_5f36bf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.glsl
index 7e22697..290bc3d0 100644
--- a/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/66fce8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3 res = mat3(vec3(1.0f), vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_66fce8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.glsl
index b0497fb..5e3ea74 100644
--- a/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/70ca11.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3x2 res = mat3x2(vec2(1.0f), vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_70ca11();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.glsl
index 0fbc2ec..867bede 100644
--- a/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/7be8b2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_7be8b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_7be8b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.glsl
index 5cec110..761a87e 100644
--- a/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/7eb2c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2 res = mat2(vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_7eb2c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.glsl
index 4af7f75..07d1dda 100644
--- a/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/844869.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_844869();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_844869();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.glsl
index 53a4bfa..760f158 100644
--- a/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/84a763.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4x2 res = mat4x2(vec2(1.0f), vec2(1.0f), vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_84a763();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl
index 4e9bf69..8d15ed2 100644
--- a/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_854336();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_854336();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.glsl
index 52a9d23..cb62449 100644
--- a/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/8c06ce.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_8c06ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_8c06ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.glsl
index 1a4eaa6..0b7a144 100644
--- a/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/ace596.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2x3 res = mat2x3(vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_ace596();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.glsl
index e96b7ee..e6ffddf 100644
--- a/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/b9ad1f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_b9ad1f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_b9ad1f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl
index 82b84b3..1d791f0 100644
--- a/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_c1b600();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_c1b600();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.glsl
index 9a99773..6df5ef6 100644
--- a/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/d6faec.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_d6faec();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_d6faec();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl
index f3c0ac3..42aa090 100644
--- a/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_d8f8ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_d8f8ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.glsl
index da3cdb7..b5ead55 100644
--- a/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/dc671a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4 res = mat4(vec4(1.0f), vec4(1.0f), vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_dc671a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl
index 44f70e3..35f4a6f 100644
--- a/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_ed4bdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_ed4bdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.glsl
index 2d4c6fb..61984f9 100644
--- a/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/transpose/faeb05.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_faeb05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_faeb05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.glsl
index 97ab57c..8d26c47 100644
--- a/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/103ab8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_103ab8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_103ab8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.glsl
index 2d15e08..c1d2080 100644
--- a/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/117396.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_117396();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl
index b0ad8c6..b9333a1 100644
--- a/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_562d05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_562d05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.glsl
index de465c0..78cf001 100644
--- a/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/7d6ded.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_7d6ded();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.glsl
index da8579a..2629d07 100644
--- a/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/a56109.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_a56109();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_a56109();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.glsl
index 21791e4..7085f60 100644
--- a/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/c12555.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_c12555();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.glsl
index 0642aff..51b4f15 100644
--- a/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/cc2b0d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_cc2b0d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_cc2b0d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.glsl
index d213a53..34f97d1 100644
--- a/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/ce7c17.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_ce7c17();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_ce7c17();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl
index 170ea22..41cf3bb 100644
--- a/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_e183aa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_e183aa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl
index f84f4a6..b18e677 100644
--- a/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_eb83df();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_eb83df();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.glsl
index c0a74c6..f026c59 100644
--- a/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/f0f1a1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_f0f1a1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl
index d894068..32f4ca9 100644
--- a/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_f370d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_f370d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl
index 275ff34..c68ebd6 100644
--- a/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16float_32a5cf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16float_32a5cf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl
index d63823a..e823e7c 100644
--- a/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16snorm_b4aea6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16snorm_b4aea6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl
index 70d7f36..1f7359a 100644
--- a/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16unorm_7699c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16unorm_7699c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl
index 6427f53..bc7a256 100644
--- a/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4x8snorm_523fb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4x8snorm_523fb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl
index 4cd7baf..d0c93c5 100644
--- a/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4x8unorm_750c74();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4x8unorm_750c74();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.glsl
index c51ba49..891d45a 100644
--- a/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack4xI8/830900.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4xI8_830900();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4xI8_830900();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.glsl
index 65c101d..23b9ff6 100644
--- a/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/unpack4xU8/a5ea55.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4xU8_a5ea55();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4xU8_a5ea55();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/002533.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/002533.wgsl.expected.glsl
index 864596b..3306c40 100644
--- a/test/tint/builtins/gen/var/abs/002533.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/002533.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_002533();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_002533();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/005174.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/005174.wgsl.expected.glsl
index 0391f43..e8589dc 100644
--- a/test/tint/builtins/gen/var/abs/005174.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/005174.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_005174();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_005174();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.glsl
index 269ada8..2a3524d 100644
--- a/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/1ce782.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_1ce782();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_1ce782();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.glsl
index 6db7fd8..8b02b4d 100644
--- a/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/1e9d53.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_1e9d53();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_1e9d53();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.glsl
index 92941e3..95cb19e 100644
--- a/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/2f861b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_2f861b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.glsl
index d170502..366b79d 100644
--- a/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/421ca3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_421ca3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_421ca3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.glsl
index 15d93ec..c11d26a 100644
--- a/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/467cd1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_467cd1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_467cd1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.glsl
index a96a3a6..54a21fd 100644
--- a/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/4ad288.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_4ad288();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_4ad288();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.glsl
index 10a38a2..1e8c4b8 100644
--- a/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/538d29.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_538d29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_538d29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.glsl
index 869bcff..6edfbd6 100644
--- a/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/577d6e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_577d6e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.glsl
index fccdf1d..e37093e 100644
--- a/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/5a8af1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_5a8af1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.glsl
index e2eec64..e47b109 100644
--- a/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/5ad50a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_5ad50a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_5ad50a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.glsl
index 3e1c29e..fb782af 100644
--- a/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/5ae4fe.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_5ae4fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_5ae4fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.glsl
index 3be3d30..2e731ff 100644
--- a/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/7326de.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7326de();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7326de();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.glsl
index a6950f4..3059fb0 100644
--- a/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/7f28e6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7f28e6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7f28e6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.glsl
index fbf59e0..eec7090 100644
--- a/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/7faa9e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_7faa9e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_7faa9e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.glsl
index a462dd6..84087ab 100644
--- a/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/82ff9d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_82ff9d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.glsl
index ed19bac..ed21bf2 100644
--- a/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/8ca9b1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_8ca9b1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.glsl
index 888e944..2747cee 100644
--- a/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/9c80a6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_9c80a6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_9c80a6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.glsl
index 7a65d35..1b8a711 100644
--- a/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/aedb6d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_aedb6d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.glsl
index 75f0fe3..a754c6f 100644
--- a/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/b96037.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_b96037();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_b96037();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.glsl
index 69d18dd..4565a53 100644
--- a/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/c3321c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_c3321c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.glsl
index f2bd90d..65cfbe1 100644
--- a/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/e28785.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   abs_e28785();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.glsl b/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.glsl
index bc8c2e1..fd7ef7c 100644
--- a/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/abs/fd247f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = abs_fd247f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = abs_fd247f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.glsl
index cc3055d..0fbdb26 100644
--- a/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/004aff.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_004aff();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_004aff();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/069188.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/069188.wgsl.expected.glsl
index d63e9a2..ae83ee8 100644
--- a/test/tint/builtins/gen/var/acos/069188.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/069188.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_069188();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.glsl
index 37f7892..fa39269 100644
--- a/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/15d35b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_15d35b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acos/203628.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/203628.wgsl.expected.glsl
index cc27acd..06d6929 100644
--- a/test/tint/builtins/gen/var/acos/203628.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/203628.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_203628();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_203628();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.glsl
index 3237a06..0edf87f 100644
--- a/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/303e3d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_303e3d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_303e3d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/489247.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/489247.wgsl.expected.glsl
index e43706c..40265a2 100644
--- a/test/tint/builtins/gen/var/acos/489247.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/489247.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_489247();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_489247();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.glsl
index bfdf5ef..ac7466d9 100644
--- a/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/4dac75.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_4dac75();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.glsl
index e155950..87e230c 100644
--- a/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/5e9ad2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.25f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acos_5e9ad2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.glsl
index 095093f..a4f0478 100644
--- a/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/8e2acf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_8e2acf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_8e2acf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.glsl
index 563b7c7..ad5bb23 100644
--- a/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/a610c4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_a610c4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_a610c4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.glsl
index fdfdbe4..3c71246 100644
--- a/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/dfc915.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_dfc915();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_dfc915();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.glsl b/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.glsl
index 5cdde95..640e5a5 100644
--- a/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acos/f47057.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acos_f47057();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acos_f47057();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.glsl
index 05c7ded..266e86d 100644
--- a/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/17260e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_17260e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.glsl
index 90f1e4f..ab9673c 100644
--- a/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/3433e8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_3433e8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.glsl
index 0978c4e..8178520 100644
--- a/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/490aae.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_490aae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.glsl
index ec175cb..2db09bc 100644
--- a/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/5f49d8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_5f49d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_5f49d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.glsl
index 7e92156..fca0656 100644
--- a/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/640883.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_640883();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_640883();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.glsl
index a7ec951..ecb32d9 100644
--- a/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/9f213e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   acosh_9f213e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.glsl
index afe7d68..c390c90 100644
--- a/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/a37dfe.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_a37dfe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_a37dfe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.glsl
index d77dedb..3074b92 100644
--- a/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/d51ccb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_d51ccb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_d51ccb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.glsl
index a0d7a55..1eac595 100644
--- a/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/de60d8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_de60d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_de60d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.glsl
index dacc3f3..8d6759b 100644
--- a/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/e38f5c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_e38f5c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_e38f5c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.glsl
index 71223bf..363984e 100644
--- a/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/ecf2d1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_ecf2d1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_ecf2d1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.glsl b/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.glsl
index 080b559..cdba461 100644
--- a/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/acosh/f56574.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = acosh_f56574();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = acosh_f56574();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.glsl b/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.glsl
index 642ad2e..8b1b976 100644
--- a/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/all/353d6a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_353d6a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_353d6a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.glsl b/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.glsl
index 12e9b27..7af65c9 100644
--- a/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/all/986c7b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_986c7b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_986c7b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.glsl b/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.glsl
index 10637fe..48dedba 100644
--- a/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/all/bd2dba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_bd2dba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_bd2dba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/all/f46790.wgsl.expected.glsl b/test/tint/builtins/gen/var/all/f46790.wgsl.expected.glsl
index 3fe892b..06404f0 100644
--- a/test/tint/builtins/gen/var/all/f46790.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/all/f46790.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = all_f46790();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = all_f46790();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/any/083428.wgsl.expected.glsl b/test/tint/builtins/gen/var/any/083428.wgsl.expected.glsl
index c0c58db..7956255 100644
--- a/test/tint/builtins/gen/var/any/083428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/any/083428.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_083428();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_083428();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.glsl b/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.glsl
index 94cb087..3e8f006 100644
--- a/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/any/0e3e58.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_0e3e58();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_0e3e58();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.glsl b/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.glsl
index ee844c6..2d4cd45 100644
--- a/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/any/2ab91a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_2ab91a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_2ab91a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.glsl b/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.glsl
index 15ae2fa..874ab3b 100644
--- a/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/any/e755c1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = any_e755c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = any_e755c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/arrayLength/1588cd.wgsl.expected.glsl b/test/tint/builtins/gen/var/arrayLength/1588cd.wgsl.expected.glsl
index 322fcba..f0553aa 100644
--- a/test/tint/builtins/gen/var/arrayLength/1588cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/1588cd.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_1588cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_1588cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl
index e56ddb0..41d9b6796 100644
--- a/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/8421b9.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_8421b9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_8421b9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/arrayLength/a0f5ca.wgsl.expected.glsl b/test/tint/builtins/gen/var/arrayLength/a0f5ca.wgsl.expected.glsl
index 0c39a0e..6fc6d9b 100644
--- a/test/tint/builtins/gen/var/arrayLength/a0f5ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/a0f5ca.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_a0f5ca();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_a0f5ca();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/arrayLength/cfca0a.wgsl.expected.glsl b/test/tint/builtins/gen/var/arrayLength/cfca0a.wgsl.expected.glsl
index d0cbdba..5974939 100644
--- a/test/tint/builtins/gen/var/arrayLength/cfca0a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/arrayLength/cfca0a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = arrayLength_cfca0a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = arrayLength_cfca0a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/064953.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/064953.wgsl.expected.glsl
index 90ede47..abc678f 100644
--- a/test/tint/builtins/gen/var/asin/064953.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/064953.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_064953();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_064953();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.glsl
index 7fa7829..dbefb42 100644
--- a/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/0bac07.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_0bac07();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.glsl
index cd210c1..c288544 100644
--- a/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/11dfda.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_11dfda();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_11dfda();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.glsl
index d8c347b..4c0cde0 100644
--- a/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/2d8e29.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_2d8e29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_2d8e29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.glsl
index 6d3648f..07a11a0 100644
--- a/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/3cfbd4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_3cfbd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_3cfbd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.glsl
index 2dfee4c..1b8aa32 100644
--- a/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/64bb1f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_64bb1f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.glsl
index e8f9d76..1e14ebb 100644
--- a/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/7b6a44.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_7b6a44();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_7b6a44();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.glsl
index 82bfd7f..50f1db5 100644
--- a/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/8cd9c9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_8cd9c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_8cd9c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.glsl
index 728682e..5ff6db8 100644
--- a/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/a5dd88.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_a5dd88();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.glsl
index 905705a..19c1935 100644
--- a/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/a6d73a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.5f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asin_a6d73a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.glsl
index 4d8ff78..275861d 100644
--- a/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/b4aced.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_b4aced();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_b4aced();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.glsl b/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.glsl
index b53b025..09bbaf1 100644
--- a/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asin/c0c272.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asin_c0c272();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asin_c0c272();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.glsl
index 2e75a8d..391fbaa 100644
--- a/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/157447.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_157447();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_157447();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.glsl
index 5af25cc..1748f74 100644
--- a/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/16b543.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_16b543();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.glsl
index c6c7a81..9a79e34 100644
--- a/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/180015.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.88137358427047729492f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_180015();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.glsl
index ea096cc..15f1692 100644
--- a/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/2265ee.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_2265ee();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_2265ee();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.glsl
index a579a49..0a7ab20 100644
--- a/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/468a48.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_468a48();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_468a48();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.glsl
index 82a8c24..9426201 100644
--- a/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/4a2226.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_4a2226();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_4a2226();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.glsl
index 62e13f9..4962152 100644
--- a/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/51079e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_51079e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.glsl
index ad71e5f..94b3294 100644
--- a/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/8d2e51.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_8d2e51();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_8d2e51();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.glsl
index 050d31d..3e26ee4 100644
--- a/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/95ab2b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_95ab2b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_95ab2b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.glsl
index c524dd8..92f350f 100644
--- a/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/ad8f8b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_ad8f8b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_ad8f8b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.glsl
index 0a3bc89..4ba6a40 100644
--- a/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/cf8603.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.88137358427047729492f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   asinh_cf8603();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.glsl b/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.glsl
index 709683c..703120b 100644
--- a/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/asinh/fb5e8c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = asinh_fb5e8c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = asinh_fb5e8c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.glsl
index a6aed16..036f5b2 100644
--- a/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/02979a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_02979a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_02979a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.glsl
index 25c2e84..74363de 100644
--- a/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/19faea.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_19faea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_19faea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.glsl
index b116dd3..03b9e0e 100644
--- a/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/1e1764.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_1e1764();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_1e1764();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.glsl
index 4b64ab3..0faabc2 100644
--- a/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/331e6d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_331e6d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_331e6d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.glsl
index c6e8c0f..1b4a8fe 100644
--- a/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/5ca7b8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_5ca7b8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.glsl
index 11006e5..4736d65 100644
--- a/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/749e1b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_749e1b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.glsl
index 6b5f150..af0a84a 100644
--- a/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/7a2a75.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.78539818525314331055f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_7a2a75();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.glsl
index 13e73f0..055ef0c 100644
--- a/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/a5f421.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a5f421();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a5f421();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.glsl
index b88901b..0712730 100644
--- a/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/a7ba61.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a7ba61();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a7ba61();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.glsl
index 26cdbb7..dc6a6a0 100644
--- a/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/a8b696.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_a8b696();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_a8b696();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.glsl
index 2cdbe62..ea63ebe 100644
--- a/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/ad96e4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan_ad96e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan_ad96e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.glsl
index 769e41c..122f997 100644
--- a/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan/d17fb2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan_d17fb2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.glsl
index d8ed5fd..9fff4d5 100644
--- a/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/034ace.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.78539818525314331055f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_034ace();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.glsl
index 43af58b..2378d87 100644
--- a/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/21dfea.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_21dfea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_21dfea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.glsl
index 1a42bc5..ed26293 100644
--- a/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/3c2865.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_3c2865();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.glsl
index 5806c04..f665dcc 100644
--- a/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/57fb13.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_57fb13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_57fb13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.glsl
index ba05c5ac..c476dd3 100644
--- a/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/93febc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_93febc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_93febc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.glsl
index c9a0d73..74c3bc1 100644
--- a/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/96057c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_96057c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_96057c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.glsl
index c529a70..1654160 100644
--- a/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/a70d0d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_a70d0d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_a70d0d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.glsl
index a1937cc..b7da3a8 100644
--- a/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/ae713e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_ae713e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_ae713e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.glsl
index 0e26f6f..cd5ce41 100644
--- a/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/c19683.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_c19683();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.glsl
index 14a3c6c..8f5f5f9 100644
--- a/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/c4be45.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.78539818525314331055f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atan2_c4be45();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.glsl
index dab578f..a887907 100644
--- a/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/ca698e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_ca698e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_ca698e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.glsl
index 7196084..e19b848 100644
--- a/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atan2/d983ab.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atan2_d983ab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atan2_d983ab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.glsl
index dbf84fe..d820e74 100644
--- a/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/440cca.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_440cca();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_440cca();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.glsl
index 0e823ab..ced1308 100644
--- a/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/5bf88d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_5bf88d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_5bf88d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.glsl
index ae88c3a..50312a5 100644
--- a/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/70d5bd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_70d5bd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.glsl
index d772d49..eeb0fef 100644
--- a/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/7997d8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_7997d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_7997d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.glsl
index ca85cd2..efd1d1c 100644
--- a/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/7f2874.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_7f2874();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.glsl
index a7f4b8b..d599ded 100644
--- a/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/c0e634.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_c0e634();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_c0e634();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.glsl
index 4d8e3ed..99f8279 100644
--- a/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/c5dc32.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.54930615425109863281f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_c5dc32();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.glsl
index 6f5a7a4..de6798e 100644
--- a/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/d2d8cd.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_d2d8cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_d2d8cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.glsl
index 80efc72..467cff3 100644
--- a/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/e3b450.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_e3b450();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_e3b450();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.glsl
index 72f13c6..0e02afa 100644
--- a/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/e431bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.54930615425109863281f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   atanh_e431bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.glsl
index d71b987..fc77834 100644
--- a/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/ec4b06.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_ec4b06();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_ec4b06();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.glsl b/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.glsl
index 7de8245..ecf20ef 100644
--- a/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/atanh/f3e01b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = atanh_f3e01b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = atanh_f3e01b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.glsl
index 2be52a2..1352e3a 100644
--- a/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/0fe0c9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_0fe0c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_0fe0c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.glsl
index 648ee32..9296469 100644
--- a/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/160c09.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_160c09();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_160c09();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.glsl
index 425eb1e..abf63b8 100644
--- a/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/16cba4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_16cba4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_16cba4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.glsl
index 83a7abc..1bcc7d5 100644
--- a/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/1c3b31.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_1c3b31();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_1c3b31();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.glsl
index bdfb2aa..ccdc81c 100644
--- a/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/1df11f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_1df11f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_1df11f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.glsl
index 125765a..cf18508 100644
--- a/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/214f23.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_214f23();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_214f23();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.glsl
index e00739b..8df299d 100644
--- a/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/23c8bd.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_23c8bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_23c8bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.glsl
index 58d4f9d..3a96353 100644
--- a/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/2421c8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2421c8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2421c8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.glsl
index 52d81e1..ef40fb0 100644
--- a/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/287bdf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_287bdf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_287bdf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.glsl
index 5455a13..6607d58 100644
--- a/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/2a6e58.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2a6e58();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2a6e58();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.glsl
index 96360f2..d8c8493 100644
--- a/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/2b05b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2b05b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2b05b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.glsl
index 5ce6ab9..0f6556a 100644
--- a/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/2b2738.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_2b2738();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_2b2738();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.glsl
index a5ddbc7..5aec241 100644
--- a/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/31c080.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_31c080();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_31c080();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.glsl
index 26d84a4..3731b7d 100644
--- a/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/332f78.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_332f78();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_332f78();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.glsl
index d8851c2..67af98a 100644
--- a/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/3e7b47.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3e7b47();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3e7b47();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.glsl
index bdfeaa5..a25b896 100644
--- a/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/3f7437.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3f7437();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3f7437();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.glsl
index c2964e9..1805cd5 100644
--- a/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/3fdacd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_3fdacd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_3fdacd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.glsl
index 07ad66e..ca5c34e 100644
--- a/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/429d64.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_429d64();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_429d64();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.glsl
index 9eb1cbf..439463f 100644
--- a/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/436211.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_436211();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_436211();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.glsl
index 50557ff..d9e4749 100644
--- a/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/5081ed.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_5081ed();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_5081ed();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.glsl
index 1d046c0..55adb5d 100644
--- a/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/56266e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_56266e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_56266e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.glsl
index 6a5fbda..f158c5b 100644
--- a/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/66e93d.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_66e93d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_66e93d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.glsl
index 63a4c44..38469fb 100644
--- a/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/674557.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_674557();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_674557();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.glsl
index 7de6335..622f7cf 100644
--- a/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/6ac6f9.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_6ac6f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_6ac6f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.glsl
index 5e2bec2..c00a683 100644
--- a/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/6de2bd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_6de2bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_6de2bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.glsl
index 47f3741..26fcad6 100644
--- a/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/70b121.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_70b121();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_70b121();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.glsl
index bcd76b2..50b7b50 100644
--- a/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/71c92a.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_71c92a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = bitcast_71c92a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.glsl
index 5908465..938f004 100644
--- a/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/745b27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_745b27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_745b27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.glsl
index 281f75a..ebd94d2 100644
--- a/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/7e67cc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_7e67cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_7e67cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.glsl
index 136ea31..1c4185d 100644
--- a/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/7ffa9c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_7ffa9c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_7ffa9c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.glsl
index 2bb9a9d..8c3f163 100644
--- a/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/81c5f5.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_81c5f5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_81c5f5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.glsl
index 0ae0482..fb95362 100644
--- a/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/8318a8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_8318a8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_8318a8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.glsl
index 1bcc5a7..2344a8a 100644
--- a/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/879dc9.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_879dc9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_879dc9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.glsl
index 21ad18f..d185e94 100644
--- a/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/899e50.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_899e50();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_899e50();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.glsl
index 6c396b6..ae202e3 100644
--- a/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/8d184c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_8d184c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_8d184c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.glsl
index 0ef85eb..73c8817 100644
--- a/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/9bcf71.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9bcf71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9bcf71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.glsl
index fdd6b45..88f19d7 100644
--- a/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/9ca42c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9ca42c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9ca42c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.glsl
index 91dcbe4..3bb02cb 100644
--- a/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/9eee21.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_9eee21();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_9eee21();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.glsl
index 6bad286..0a72967 100644
--- a/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/a4b290.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a4b290();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a4b290();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.glsl
index 75bb3c9..f78f9df 100644
--- a/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/a58b50.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a58b50();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a58b50();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.glsl
index 4224aec..f8df4c5 100644
--- a/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/a5c539.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a5c539();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a5c539();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.glsl
index 419ede8..27c89be 100644
--- a/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/a8c93f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a8c93f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a8c93f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.glsl
index b201ab0..071f05e 100644
--- a/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/a8ea1b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_a8ea1b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_a8ea1b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.glsl
index 329a21f..e71965c 100644
--- a/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/ac09d0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ac09d0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ac09d0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.glsl
index f544bb3..8c8f30a 100644
--- a/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/ad4b05.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ad4b05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ad4b05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.glsl
index 3dc03ef..baf9bea09 100644
--- a/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/b28cbd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_b28cbd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_b28cbd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.glsl
index 941deab..a18ae41 100644
--- a/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/b77573.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_b77573();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_b77573();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.glsl
index 47c687a..cdff00c 100644
--- a/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/bc3994.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_bc3994();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = bitcast_bc3994();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.glsl
index de3f77c..5afcd2e 100644
--- a/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/c69aaf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_c69aaf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_c69aaf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.glsl
index 6f6f898..881cc98 100644
--- a/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/ca5c3f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_ca5c3f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_ca5c3f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.glsl
index 24cbedc..f426b96 100644
--- a/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/cc7aa7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_cc7aa7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_cc7aa7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.glsl
index 6234d00..9d59f12 100644
--- a/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/d29765.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_d29765();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_d29765();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.glsl
index 100e246..0c40255 100644
--- a/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/dce842.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_dce842();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_dce842();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.glsl
index 691a679..6ed5230 100644
--- a/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/e61c57.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_e61c57();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_e61c57();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.glsl
index 8a95142..664e7c3 100644
--- a/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/e6c18f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_e6c18f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_e6c18f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.glsl b/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.glsl
index d63e957..0bf58fa 100644
--- a/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/bitcast/f756cd.wgsl.expected.glsl
@@ -50,16 +50,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = bitcast_f756cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = bitcast_f756cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.glsl
index ad82d43..e00c4be 100644
--- a/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/09bf52.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_09bf52();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_09bf52();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.glsl
index 0335b24..f937663 100644
--- a/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/11b1dc.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_11b1dc();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.glsl
index e8e6691..683ef62 100644
--- a/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/18c240.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_18c240();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_18c240();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.glsl
index 7d48d01..77efe8a 100644
--- a/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/32c946.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_32c946();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.glsl
index de18407..894b210 100644
--- a/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/34064b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_34064b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_34064b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.glsl
index 5f355de..bdc6e6f 100644
--- a/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/4bca2a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_4bca2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_4bca2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.glsl
index e21122c..22a4317 100644
--- a/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/678655.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_678655();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_678655();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.glsl
index 63a06f6..712a08f 100644
--- a/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/96f597.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_96f597();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_96f597();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.glsl
index 6bdf652..3590ffc 100644
--- a/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/b74c16.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_b74c16();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_b74c16();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.glsl
index 23b646d..627fc19 100644
--- a/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/bb2ca2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_bb2ca2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.glsl
index 4738747..1a83959 100644
--- a/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/e0b70a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ceil_e0b70a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.glsl b/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.glsl
index 8497bae..e715e13 100644
--- a/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ceil/f3f889.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ceil_f3f889();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ceil_f3f889();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.glsl
index e11fbf9..771aec6 100644
--- a/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/0acf8f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_0acf8f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_0acf8f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.glsl
index f34d6b3..3c64c54 100644
--- a/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/177548.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_177548();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.glsl
index 272b0ba..5356742 100644
--- a/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/1a32e3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_1a32e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_1a32e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.glsl
index f1cb39b..467e7e0 100644
--- a/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/235b29.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_235b29();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_235b29();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.glsl
index 1935b7a..cf9b8b5 100644
--- a/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/23aa4f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_23aa4f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.glsl
index 9c16d73..13f98c8 100644
--- a/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/2bd567.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2bd567();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2bd567();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.glsl
index bfe2c0c..3db4048 100644
--- a/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/2bde41.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2bde41();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2bde41();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.glsl
index 86a526c..4acf325 100644
--- a/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/2c251b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_2c251b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_2c251b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.glsl
index 020312a..fc699ea 100644
--- a/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/548fc7.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_548fc7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_548fc7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.glsl
index 5fa193a..4c3a861 100644
--- a/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/553ffb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_553ffb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_553ffb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.glsl
index dc382c84..778f4ef 100644
--- a/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/5cf700.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_5cf700();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.glsl
index 964635f..bfa072c 100644
--- a/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/5f0819.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_5f0819();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_5f0819();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.glsl
index f2593cf..bb6c428 100644
--- a/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/6c1749.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_6c1749();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_6c1749();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.glsl
index babefa8..d2436e6 100644
--- a/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/7706d7.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_7706d7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_7706d7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.glsl
index e0d61fe..93badc5 100644
--- a/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/867397.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_867397();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_867397();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.glsl
index d936821..03b22d1 100644
--- a/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/87df46.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_87df46();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.glsl
index 5bb38f9..b010ace 100644
--- a/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/8b1eaa.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_8b1eaa();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.glsl
index 028c3b1..ea6603e 100644
--- a/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/96e56a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_96e56a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.glsl
index 548a4a6..519e4ee 100644
--- a/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/9d731c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_9d731c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.glsl
index 45d92a2..f281754 100644
--- a/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/a2de25.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_a2de25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_a2de25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.glsl
index 7f9dc06..cb986fc 100644
--- a/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/b07c65.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_b07c65();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_b07c65();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.glsl
index 0bd2f44..a8d22ea 100644
--- a/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/b195eb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_b195eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_b195eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.glsl
index 86bceb4..d9100dc 100644
--- a/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/bd43ce.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = clamp_bd43ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = clamp_bd43ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.glsl b/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.glsl
index 86108fe..57c09dd 100644
--- a/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/clamp/d396af.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   clamp_d396af();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.glsl
index b28f177..924534d 100644
--- a/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/0835a8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_0835a8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_0835a8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.glsl
index e470c44..0012ab7 100644
--- a/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/0a89f7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_0a89f7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_0a89f7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.glsl
index 12d53d7..ee51384 100644
--- a/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/16dc15.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_16dc15();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_16dc15();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.glsl
index 3b2dab2..6c8ee043 100644
--- a/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/29d66d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_29d66d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_29d66d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.glsl
index cf6fb1f..ffee1d4 100644
--- a/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/47d768.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_47d768();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.glsl
index d9d1ff1..4ef2942 100644
--- a/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/5bc2c6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_5bc2c6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_5bc2c6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.glsl
index cf9bbb1..1dcabb1 100644
--- a/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/6b1fdf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_6b1fdf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.glsl
index e890f34..57357e3 100644
--- a/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/a297d4.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_a297d4();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.glsl
index 39524af..4ac07e7 100644
--- a/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/af7447.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cos_af7447();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.glsl
index 768e0f8..b159ffb 100644
--- a/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/c3b486.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_c3b486();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_c3b486();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.glsl
index 2dbabc6..0cb6907 100644
--- a/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/c5c28e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_c5c28e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_c5c28e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.glsl b/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.glsl
index f19fd90..37f0e56 100644
--- a/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cos/fc047d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cos_fc047d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cos_fc047d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.glsl
index d863f1e..bb7462e 100644
--- a/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/2ed778.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_2ed778();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_2ed778();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.glsl
index 0e79971..24b7b3f 100644
--- a/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/377652.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_377652();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_377652();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.glsl
index 7f2cf00..9f9ee3d 100644
--- a/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/3b7bbf.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_3b7bbf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_3b7bbf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.glsl
index 88690a8..79845da 100644
--- a/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/432645.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_432645();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.glsl
index 9b543d1..00e6902 100644
--- a/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/43b672.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_43b672();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_43b672();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.glsl
index 24a4cdd..a1c1f6de 100644
--- a/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/b1b8a0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_b1b8a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_b1b8a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.glsl
index 1bb31aa..0aef5f1 100644
--- a/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/c13756.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_c13756();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_c13756();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.glsl
index 33fc34c..7c1877d 100644
--- a/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/c892bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_c892bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.glsl
index 2575d29..bf77d9b 100644
--- a/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/d8dee7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_d8dee7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.glsl
index 46954db..45c0ed6 100644
--- a/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/da92dd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_da92dd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_da92dd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.glsl
index 13fa470..7984cc1 100644
--- a/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/e0c1de.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cosh_e0c1de();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cosh_e0c1de();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.glsl b/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.glsl
index 7d40377..f226543 100644
--- a/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cosh/f67ff1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cosh_f67ff1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.glsl
index 189d80a..0d976fd 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/208d46.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_208d46();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_208d46();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.glsl
index 5b28857..edf3c85 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/6d4656.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_6d4656();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_6d4656();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.glsl
index b330101..fb3f192 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/70783f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_70783f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_70783f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.glsl
index 790dac6..6e9335a 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/7c38a6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_7c38a6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_7c38a6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.glsl
index daba0b2..072d8f5 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/858d40.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_858d40();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_858d40();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.glsl
index 94d416f..6119414 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/ab6345.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_ab6345();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_ab6345();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.glsl
index f15fe2d..53aaff2 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/eab32b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_eab32b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_eab32b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.glsl b/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.glsl
index b391de3..91c7b446 100644
--- a/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countLeadingZeros/f70103.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countLeadingZeros_f70103();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countLeadingZeros_f70103();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.glsl
index e0caec5..d5070cb 100644
--- a/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/0d0e46.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_0d0e46();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_0d0e46();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.glsl
index fd99d6d..1071f8a 100644
--- a/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/0f7980.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_0f7980();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_0f7980();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.glsl
index 2e48055..569959b 100644
--- a/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/65d2ae.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_65d2ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_65d2ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.glsl
index b2fe0e4..6526a77 100644
--- a/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/690cfc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_690cfc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_690cfc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.glsl
index 9e2c12e..ea58014 100644
--- a/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/94fd81.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_94fd81();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_94fd81();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.glsl
index 4f342c3..62015da 100644
--- a/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/ae44f9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_ae44f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_ae44f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.glsl
index d94617c..31dc4b9 100644
--- a/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/af90e2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_af90e2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_af90e2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.glsl b/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.glsl
index 4b20022..8e68a37 100644
--- a/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countOneBits/fd88b2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countOneBits_fd88b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = countOneBits_fd88b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.glsl
index 2fad339..f15f5ba 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/1ad138.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_1ad138();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_1ad138();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.glsl
index 57c05dd..b3d51d5 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/1dc84a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_1dc84a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_1dc84a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.glsl
index 5aaef31..7baaa05 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/21e394.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_21e394();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_21e394();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.glsl
index 0f87da3..3768d99 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/327c37.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_327c37();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_327c37();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.glsl
index 5e1dac3..d3eb787 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/42fed6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_42fed6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_42fed6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.glsl
index 629b92a..7176fc5 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/8ed26f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_8ed26f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_8ed26f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.glsl
index da0292b..a752387 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/acfacb.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_acfacb();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_acfacb();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.glsl b/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.glsl
index 1a65622..8441ac2 100644
--- a/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/countTrailingZeros/d2b4a0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = countTrailingZeros_d2b4a0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = countTrailingZeros_d2b4a0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.glsl b/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.glsl
index c3d277c..6353e0b 100644
--- a/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cross/041cb0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cross_041cb0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cross_041cb0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.glsl b/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.glsl
index 98bc652..cb0d823 100644
--- a/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cross/1d7933.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   cross_1d7933();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.glsl b/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.glsl
index 85d5de6..15a1cfe 100644
--- a/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/cross/9857cb.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = cross_9857cb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = cross_9857cb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.glsl
index 2141852..164c0e1 100644
--- a/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/0d170c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_0d170c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_0d170c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.glsl
index bdf8114..eb87e1d 100644
--- a/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/1ad5df.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_1ad5df();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_1ad5df();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.glsl
index edda94d..959d451 100644
--- a/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/2af623.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_2af623();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_2af623();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.glsl
index 0a463f3..59ca966 100644
--- a/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/3055d3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_3055d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_3055d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.glsl
index 6ca44e9..b857708 100644
--- a/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/51f705.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_51f705();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_51f705();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.glsl
index 61df622..864a717 100644
--- a/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/5e9805.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_5e9805();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_5e9805();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.glsl
index 2d1526a..98bf657 100644
--- a/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/810467.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_810467();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.glsl
index 54fdfa9..ae81504 100644
--- a/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/c0880c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_c0880c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.glsl
index 6a7485d..1b3d4c9 100644
--- a/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/d43a49.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(57.295780181884765625f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_d43a49();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.glsl
index d775fe4..a907a7f 100644
--- a/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/dfe8f4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_dfe8f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_dfe8f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.glsl
index 09d6550..f58d584 100644
--- a/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/f59715.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = degrees_f59715();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = degrees_f59715();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.glsl b/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.glsl
index 413f77f..0dd80f9 100644
--- a/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/degrees/fafa7e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 57.295780181884765625f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   degrees_fafa7e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.glsl
index b07b0a8..e89f343 100644
--- a/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/1bf6e7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_1bf6e7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.glsl
index 76d3988..1bf211d 100644
--- a/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/2b62ba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_2b62ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_2b62ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.glsl
index 1546dd7..e4ebef7 100644
--- a/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/32bfde.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_32bfde();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_32bfde();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.glsl
index c2d034d..23bf15d 100644
--- a/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/a0a87c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_a0a87c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_a0a87c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.glsl
index 3c6e200..23a0c1e 100644
--- a/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/c8251d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_c8251d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.glsl
index 085877d..2b1ebed 100644
--- a/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/cefdf3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   determinant_cefdf3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.glsl
index 9265292..94a46cc 100644
--- a/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/d7c86f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_d7c86f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_d7c86f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.glsl
index bacb3d7..fd7a206 100644
--- a/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/e19305.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_e19305();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_e19305();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.glsl b/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.glsl
index 79b920c..75f9d91 100644
--- a/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/determinant/fc12a5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = determinant_fc12a5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = determinant_fc12a5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.glsl
index d3f0cea..0bcd10f 100644
--- a/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/0657d4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_0657d4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_0657d4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.glsl
index ecda58d..da9ea92 100644
--- a/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/3a175a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_3a175a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.glsl
index 6343adb..a42dbbc 100644
--- a/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/7272f3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_7272f3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_7272f3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.glsl
index 6c6ca18..bb07252 100644
--- a/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/7d201f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_7d201f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_7d201f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.glsl
index 0973bb6..0355740 100644
--- a/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/83911f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_83911f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.glsl
index c8b94a2..ac6acf6 100644
--- a/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/892a5d.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_892a5d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_892a5d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.glsl
index 00a4628..530ab9f 100644
--- a/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/928fa0.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_928fa0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_928fa0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.glsl
index b558883..2e5c0e8 100644
--- a/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/9646ea.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_9646ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_9646ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.glsl
index 7318bec..835874f 100644
--- a/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/aa4055.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_aa4055();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_aa4055();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.glsl
index a77edcc..8c9b4bf 100644
--- a/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/ac5535.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_ac5535();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.glsl
index 5342389..2305f38 100644
--- a/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/cfed73.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = distance_cfed73();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = distance_cfed73();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.glsl b/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.glsl
index 262264f..ae55569 100644
--- a/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/distance/f9c9ee.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   distance_f9c9ee();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.glsl
index 6c2654e..837b28a 100644
--- a/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/08eb56.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 4.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_08eb56();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.glsl
index cf36928..0f9515f 100644
--- a/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/0c577b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_0c577b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_0c577b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.glsl
index 6f3d31a..3300d5c 100644
--- a/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/0d2c2e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_0d2c2e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.glsl
index f779e7f..890cd59 100644
--- a/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/14bc63.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 2;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_14bc63();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.glsl
index d45a008..5b7173f 100644
--- a/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/5a4c8f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 3.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_5a4c8f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.glsl
index cf662c2..76ae883 100644
--- a/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/7548a0.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_7548a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_7548a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.glsl
index ba6d920..ec50a9a 100644
--- a/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/883f0e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_883f0e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_883f0e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.glsl
index 9f6a0af..bd1604f 100644
--- a/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/8e40f1.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_8e40f1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_8e40f1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.glsl
index 024cc3b..1bb1b0c 100644
--- a/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/97c7ee.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_97c7ee();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_97c7ee();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.glsl
index 4b96886..8771401 100644
--- a/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/ba4246.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_ba4246();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_ba4246();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.glsl
index a596451..d23282b 100644
--- a/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/c11efe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 3;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_c11efe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.glsl
index 5302c00..2b346c8 100644
--- a/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/cd5a04.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_cd5a04();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_cd5a04();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.glsl
index cb43b2b..a2ff015 100644
--- a/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/d0d179.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_d0d179();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_d0d179();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.glsl
index e5f1348..6b42ef5 100644
--- a/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/e994c7.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_e994c7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_e994c7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.glsl
index 842136e..56433fa 100644
--- a/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/eb9fbf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 4;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   dot_eb9fbf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.glsl
index 70890aa..641b349 100644
--- a/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/ef6b1d.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_ef6b1d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_ef6b1d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.glsl
index 0af7917..62e376a 100644
--- a/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/f1312c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_f1312c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_f1312c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.glsl
index 2f53f35..3ca559f 100644
--- a/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot/fc5f7c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot_fc5f7c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = dot_fc5f7c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.glsl
index d26ca8d..f923508 100644
--- a/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot4I8Packed/881e62.wgsl.expected.glsl
@@ -86,16 +86,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot4I8Packed_881e62();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), 0);
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = dot4I8Packed_881e62();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.glsl b/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.glsl
index 4e699ec..94263c3 100644
--- a/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/dot4U8Packed/fbed7b.wgsl.expected.glsl
@@ -86,16 +86,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = dot4U8Packed_fbed7b();
-  return tint_symbol;
+  VertexOutput v_7 = VertexOutput(vec4(0.0f), 0u);
+  v_7.pos = vec4(0.0f);
+  v_7.prevent_dce = dot4U8Packed_fbed7b();
+  return v_7;
 }
 void main() {
-  VertexOutput v_7 = vertex_main_inner();
-  gl_Position = v_7.pos;
+  VertexOutput v_8 = vertex_main_inner();
+  gl_Position = v_8.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_7.prevent_dce;
+  tint_interstage_location0 = v_8.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.glsl
index 99e73cd..f44914d 100644
--- a/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/0f70eb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_0f70eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_0f70eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.glsl
index 8e182d4..5dc5ff0 100644
--- a/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/13806d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_13806d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_13806d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.glsl
index 1dc8fe5..8106e0c 100644
--- a/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/1951e7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_1951e7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_1951e7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.glsl
index 34a308e..8c1b544 100644
--- a/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/2e08e2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_2e08e2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_2e08e2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.glsl
index ffb2281..1779e47 100644
--- a/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/49e4c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.71828174591064453125f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_49e4c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.glsl
index 47866e4..1ffffe4 100644
--- a/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/611a87.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_611a87();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_611a87();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/699629.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/699629.wgsl.expected.glsl
index 7756de7..44df8d9 100644
--- a/test/tint/builtins/gen/var/exp/699629.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/699629.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_699629();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.glsl
index 5da10a1..7d69186 100644
--- a/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/771fd2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_771fd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_771fd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.glsl
index 3a77649..f941294 100644
--- a/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/bda5bb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_bda5bb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.glsl
index fd83bb7..b2faa48 100644
--- a/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/c18fe9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_c18fe9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_c18fe9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.glsl
index 6b657de..73b7e76 100644
--- a/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/d98450.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp_d98450();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp_d98450();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.glsl
index 022e350..d3685b8 100644
--- a/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp/dad791.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.71828174591064453125f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp_dad791();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.glsl
index 33d60dd..502e258 100644
--- a/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/151a4c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_151a4c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_151a4c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.glsl
index 941c061..5486cc4 100644
--- a/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/18aa76.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_18aa76();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.glsl
index ec994cc..9ae9190 100644
--- a/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/1f8680.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_1f8680();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_1f8680();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.glsl
index 265400d..5c3ee81 100644
--- a/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/303753.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_303753();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.glsl
index 39673a4..fcd926a 100644
--- a/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/751377.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_751377();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_751377();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.glsl
index 57c33e4..1f5e49f 100644
--- a/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/8bd72d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_8bd72d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.glsl
index 45fb9c0..b3278e1 100644
--- a/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/a9d0a7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_a9d0a7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_a9d0a7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.glsl
index dc69aa2..712fd80 100644
--- a/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/b408e4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_b408e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_b408e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.glsl
index e1d04fb..57041af 100644
--- a/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/d6777c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_d6777c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_d6777c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.glsl
index c0e49e2..e89c6b0 100644
--- a/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/dea523.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_dea523();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_dea523();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.glsl
index fb8cd2c..7fdccc5 100644
--- a/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/f4f0f1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   exp2_f4f0f1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.glsl b/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.glsl
index 9f62a40..fc8a7f9 100644
--- a/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/exp2/ffa827.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = exp2_ffa827();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = exp2_ffa827();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.glsl
index 705b2da..5a33ea6 100644
--- a/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/12b197.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_12b197();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_12b197();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.glsl
index 11b3973..fddf6b6 100644
--- a/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/249874.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_249874();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_249874();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.glsl
index ca1a96c..c2214f5 100644
--- a/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/631377.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_631377();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_631377();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.glsl
index 4e44e87..1113668 100644
--- a/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/a99a8d.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_a99a8d();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_a99a8d();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.glsl
index 857ac1a..b0b55ed 100644
--- a/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/ce81f8.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_ce81f8();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0u);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_ce81f8();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.glsl
index 7576d65..705aafc 100644
--- a/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/e04f5d.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_e04f5d();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_e04f5d();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.glsl
index 63e99bd..6cc2cbf 100644
--- a/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/f28f69.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_f28f69();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_f28f69();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.glsl b/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.glsl
index d3ef851..b41c6d6 100644
--- a/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/extractBits/fb850f.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = extractBits_fb850f();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = extractBits_fb850f();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.glsl
index 423c9b6..2ecc613 100644
--- a/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/2c4d14.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_2c4d14();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.glsl
index 007523c..54090a1 100644
--- a/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/524986.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_524986();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_524986();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.glsl
index 36c0f7c..d05de42 100644
--- a/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/5afbd5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_5afbd5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_5afbd5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.glsl
index 964abf5..a7c9592 100644
--- a/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/b316e5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_b316e5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_b316e5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.glsl
index d2cffb7..ed7a559 100644
--- a/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/b42ef3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_b42ef3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.glsl
index 6e21a00..ccb17e3 100644
--- a/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/cc63dc.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_cc63dc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_cc63dc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.glsl
index e919f15..91745f6 100644
--- a/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/e6908b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_e6908b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_e6908b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.glsl
index b100299..3180842 100644
--- a/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/fb0f2e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = faceForward_fb0f2e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = faceForward_fb0f2e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.glsl b/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.glsl
index 46928e3..940d6c0 100644
--- a/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/faceForward/fe522b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   faceForward_fe522b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.glsl
index 3cee57c..3fe742b 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/000ff3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_000ff3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_000ff3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.glsl
index 54f4f4c..caa543e 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/35053e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_35053e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_35053e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.glsl
index b41a50e..afa205a 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/3fd7d0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_3fd7d0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_3fd7d0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.glsl
index a2260ba..a58e5df 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/57a1a3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_57a1a3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_57a1a3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.glsl
index 0b56c40..8de6371 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/6fe804.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_6fe804();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_6fe804();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.glsl
index 3701e89..3817da2 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/a622c2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_a622c2();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_a622c2();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.glsl
index f617817..b38ee42 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/c1f940.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_c1f940();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_c1f940();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.glsl
index 84f1d35..d9642c8 100644
--- a/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstLeadingBit/f0779d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstLeadingBit_f0779d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstLeadingBit_f0779d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.glsl
index aedb2e7..237a620 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/110f2c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_110f2c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_110f2c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.glsl
index b589f18..530ef42 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/3a2acc.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_3a2acc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_3a2acc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.glsl
index e943369..723ad4a 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/45eb10.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_45eb10();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_45eb10();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.glsl
index df143e7..822cb13 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/47d475.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_47d475();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_47d475();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.glsl
index 5e1f13b..28dce20 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/50c072.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_50c072();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_50c072();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.glsl
index 7c2d444..f88e1c2 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/7496d6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_7496d6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_7496d6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.glsl
index 688d832..ca1f2f4 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/86551b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_86551b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_86551b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.glsl
index 0b8e2e1..dd2fc4b 100644
--- a/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/firstTrailingBit/cb51ce.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = firstTrailingBit_cb51ce();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = firstTrailingBit_cb51ce();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/218952.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/218952.wgsl.expected.glsl
index cf16314..956562d 100644
--- a/test/tint/builtins/gen/var/floor/218952.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/218952.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_218952();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.glsl
index de7eb83..e6bcb3a 100644
--- a/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/3802c0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_3802c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_3802c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.glsl
index a821ea2..e457705 100644
--- a/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/3bccc4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_3bccc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_3bccc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.glsl
index d67def6..0dc8505 100644
--- a/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/5fc9ac.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_5fc9ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_5fc9ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.glsl
index c5cab4a..fbf83355 100644
--- a/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/60d7ea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_60d7ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_60d7ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.glsl
index 9dd102e..73e0c73 100644
--- a/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/66f154.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_66f154();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_66f154();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.glsl
index 7e9f88f..d5ef7c7 100644
--- a/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/84658c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_84658c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_84658c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/953774.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/953774.wgsl.expected.glsl
index 9424220..bd9c6bc 100644
--- a/test/tint/builtins/gen/var/floor/953774.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/953774.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_953774();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.glsl
index 2230d06..75cfdc0 100644
--- a/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/a2d31b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_a2d31b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_a2d31b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.glsl
index 97e5172..d0460a7 100644
--- a/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/b6e09c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = floor_b6e09c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = floor_b6e09c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.glsl
index 8e13bf2..e959d52 100644
--- a/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/dcd5a2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_dcd5a2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.glsl b/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.glsl
index 4805cfa..31b9828 100644
--- a/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/floor/e585ef.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   floor_e585ef();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.glsl
index 2ec282e..8fb3971 100644
--- a/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/143d5d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_143d5d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.glsl
index 81e5e75..038232e 100644
--- a/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/1f5084.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_1f5084();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.glsl
index 297a178..9f9b2cc 100644
--- a/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/26a7a9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_26a7a9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_26a7a9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/466442.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/466442.wgsl.expected.glsl
index dbcf956..8c8f693 100644
--- a/test/tint/builtins/gen/var/fma/466442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/466442.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_466442();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.glsl
index d8a6387..fc82770 100644
--- a/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/6a3283.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_6a3283();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_6a3283();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.glsl
index d01490c..053ca04 100644
--- a/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/ab7818.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_ab7818();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_ab7818();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.glsl
index bb84dea..7669c88 100644
--- a/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/bf21b6.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_bf21b6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_bf21b6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.glsl
index 30e2272..a947f34 100644
--- a/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/c10ba3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_c10ba3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_c10ba3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.glsl
index 42f7bc7..9da19c9 100644
--- a/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/c8abb3.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_c8abb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_c8abb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.glsl
index 7679e82..951af94 100644
--- a/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/e17c5c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_e17c5c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_e17c5c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.glsl
index 20aeba7..fcf4998 100644
--- a/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/e7abdc.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fma_e7abdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fma_e7abdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.glsl
index b445047..cda000a 100644
--- a/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fma/eb25d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fma_eb25d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.glsl
index c125e65..11686cc 100644
--- a/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/181aa9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_181aa9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_181aa9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.glsl
index e368c33..b8c9bde 100644
--- a/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/2eddfe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.25f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_2eddfe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.glsl
index f5e8f0f..8a6f54e 100644
--- a/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/498c77.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_498c77();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_498c77();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.glsl
index b6a6b1b..ad195d4 100644
--- a/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/7e3f2d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_7e3f2d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.glsl
index 58c3c3b..376a1b0 100644
--- a/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/8bc1e9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_8bc1e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_8bc1e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.glsl
index 6eab741..5292356 100644
--- a/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/943cb1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_943cb1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_943cb1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.glsl
index e7ccca6..e20abb0 100644
--- a/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/958a1d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_958a1d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_958a1d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.glsl
index 9f41fcc..685a3b6 100644
--- a/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/a49758.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_a49758();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_a49758();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.glsl
index f0e755a..fd035a5 100644
--- a/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/eb38ce.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_eb38ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_eb38ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.glsl
index 5361ce5..13a6561 100644
--- a/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/ed00ca.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_ed00ca();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.glsl
index a62fe0a..38ff4b3 100644
--- a/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/ed2f79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.25f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   fract_ed2f79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.glsl b/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.glsl
index 9382891..b05135a 100644
--- a/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/fract/fa5c71.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = fract_fa5c71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = fract_fa5c71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.glsl
index 708f6a3..c6ff05b 100644
--- a/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/34bbfb.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_34bbfb() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_34bbfb() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec4_f32 res = frexp_result_vec4_f32(vec4(0.5f), ivec4(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_34bbfb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.glsl
index e15d6da..1aaa9f7 100644
--- a/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/3dd21e.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_3dd21e() {
   f16vec4 arg_0 = f16vec4(1.0hf);
   frexp_result_vec4_f16 v = frexp_result_vec4_f16(f16vec4(0.0hf), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_3dd21e() {
   f16vec4 arg_0 = f16vec4(1.0hf);
   frexp_result_vec4_f16 v = frexp_result_vec4_f16(f16vec4(0.0hf), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,8 +51,8 @@
 
 
 struct frexp_result_vec4_f16 {
-  f16vec4 fract;
-  ivec4 exp;
+  f16vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -62,14 +62,14 @@
 void frexp_3dd21e() {
   f16vec4 arg_0 = f16vec4(1.0hf);
   frexp_result_vec4_f16 v = frexp_result_vec4_f16(f16vec4(0.0hf), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_3dd21e();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
index a01a656..24b5547 100644
--- a/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,8 +48,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -59,14 +59,14 @@
 void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result_f32 v = frexp_result_f32(0.0f, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_4b2200();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.glsl
index bfe1130..209c602 100644
--- a/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/5257dd.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 void frexp_5257dd() {
   float16_t arg_0 = 1.0hf;
   frexp_result_f16 v = frexp_result_f16(0.0hf, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 void frexp_5257dd() {
   float16_t arg_0 = 1.0hf;
   frexp_result_f16 v = frexp_result_f16(0.0hf, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,8 +51,8 @@
 
 
 struct frexp_result_f16 {
-  float16_t fract;
-  int exp;
+  float16_t member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -62,14 +62,14 @@
 void frexp_5257dd() {
   float16_t arg_0 = 1.0hf;
   frexp_result_f16 v = frexp_result_f16(0.0hf, 0);
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_5257dd();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.glsl
index 21841a2..f23f34a 100644
--- a/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/5f47bf.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_5f47bf() {
   f16vec2 arg_0 = f16vec2(1.0hf);
   frexp_result_vec2_f16 v = frexp_result_vec2_f16(f16vec2(0.0hf), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_5f47bf() {
   f16vec2 arg_0 = f16vec2(1.0hf);
   frexp_result_vec2_f16 v = frexp_result_vec2_f16(f16vec2(0.0hf), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,8 +51,8 @@
 
 
 struct frexp_result_vec2_f16 {
-  f16vec2 fract;
-  ivec2 exp;
+  f16vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -62,14 +62,14 @@
 void frexp_5f47bf() {
   f16vec2 arg_0 = f16vec2(1.0hf);
   frexp_result_vec2_f16 v = frexp_result_vec2_f16(f16vec2(0.0hf), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_5f47bf();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.glsl
index 2b9d83f..19f8332 100644
--- a/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/6fb3ad.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_6fb3ad() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_6fb3ad() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec2_f32 res = frexp_result_vec2_f32(vec2(0.5f), ivec2(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_6fb3ad();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
index 1588319..3c9a858 100644
--- a/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4_f32 v = frexp_result_vec4_f32(vec4(0.0f), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4_f32 v = frexp_result_vec4_f32(vec4(0.0f), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,8 +48,8 @@
 
 
 struct frexp_result_vec4_f32 {
-  vec4 fract;
-  ivec4 exp;
+  vec4 member_0;
+  ivec4 member_1;
 };
 
 struct VertexOutput {
@@ -59,14 +59,14 @@
 void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4_f32 v = frexp_result_vec4_f32(vec4(0.0f), ivec4(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec4_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_77af93();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
index c1a1b0c..4867e89 100644
--- a/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3_f32 v = frexp_result_vec3_f32(vec3(0.0f), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3_f32 v = frexp_result_vec3_f32(vec3(0.0f), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,8 +48,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -59,14 +59,14 @@
 void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3_f32 v = frexp_result_vec3_f32(vec3(0.0f), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_979800();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.glsl
index 9ae41be..78e8435 100644
--- a/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/ae4a66.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_ae4a66() {
   f16vec3 arg_0 = f16vec3(1.0hf);
   frexp_result_vec3_f16 v = frexp_result_vec3_f16(f16vec3(0.0hf), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_ae4a66() {
   f16vec3 arg_0 = f16vec3(1.0hf);
   frexp_result_vec3_f16 v = frexp_result_vec3_f16(f16vec3(0.0hf), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,8 +51,8 @@
 
 
 struct frexp_result_vec3_f16 {
-  f16vec3 fract;
-  ivec3 exp;
+  f16vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -62,14 +62,14 @@
 void frexp_ae4a66() {
   f16vec3 arg_0 = f16vec3(1.0hf);
   frexp_result_vec3_f16 v = frexp_result_vec3_f16(f16vec3(0.0hf), ivec3(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec3_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_ae4a66();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.glsl
index 07a69c9..28d42b7 100644
--- a/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/bee870.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_bee870() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void frexp_bee870() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_f32 res = frexp_result_f32(0.5f, 1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_bee870();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.glsl
index 2e1a8f3..41847a5 100644
--- a/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/bf45ae.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_bf45ae() {
@@ -24,8 +24,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 void frexp_bf45ae() {
@@ -42,8 +42,8 @@
 
 
 struct frexp_result_vec3_f32 {
-  vec3 fract;
-  ivec3 exp;
+  vec3 member_0;
+  ivec3 member_1;
 };
 
 struct VertexOutput {
@@ -54,10 +54,10 @@
   frexp_result_vec3_f32 res = frexp_result_vec3_f32(vec3(0.5f), ivec3(1));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   frexp_bf45ae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
index 1d59a5e..066137a 100644
--- a/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2_f32 v = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2_f32 v = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,8 +48,8 @@
 
 
 struct frexp_result_vec2_f32 {
-  vec2 fract;
-  ivec2 exp;
+  vec2 member_0;
+  ivec2 member_1;
 };
 
 struct VertexOutput {
@@ -59,14 +59,14 @@
 void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2_f32 v = frexp_result_vec2_f32(vec2(0.0f), ivec2(0));
-  v.fract = frexp(arg_0, v.exp);
+  v.member_0 = frexp(arg_0, v.member_1);
   frexp_result_vec2_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   frexp_eb2421();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.glsl
index 8d77195..0b9d916 100644
--- a/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/3c7ba5.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_3c7ba5();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_3c7ba5();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.glsl
index 9df745a..a57e287 100644
--- a/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/428b0b.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_428b0b();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_428b0b();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.glsl
index df7eb72..c5e4e49 100644
--- a/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/51ede1.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_51ede1();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_51ede1();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.glsl
index 6f6afb6..9e7fc1c 100644
--- a/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/65468b.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_65468b();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_65468b();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.glsl
index e7cbd25..ba0be9b 100644
--- a/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/87826b.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_87826b();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_87826b();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.glsl
index 21b9a60..1b565ff 100644
--- a/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/d86978.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_d86978();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_d86978();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.glsl
index db1e315..af1347d 100644
--- a/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/e3e3a2.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_e3e3a2();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0u);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_e3e3a2();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.glsl b/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.glsl
index 6ea8349..265eb03 100644
--- a/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/insertBits/fe6ba6.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = insertBits_fe6ba6();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = insertBits_fe6ba6();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.glsl
index 3c6f47b..54115aa 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/07a6fe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_07a6fe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.glsl
index f751d0a..c3f2e5b 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/440300.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_440300();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_440300();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.glsl
index 24f645b..b53a4e9 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/4ca6d6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_4ca6d6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.glsl
index fb0c1ad..b873437 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/5f51f8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_5f51f8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_5f51f8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.glsl
index 0d98d47..4b13a55 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/6d0783.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_6d0783();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.glsl
index 7963881..4ef35f4 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/84407e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_84407e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_84407e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.glsl
index 354acf7..2631b38 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/8f2bd2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_8f2bd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_8f2bd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.glsl
index 904a159..7601aa8 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/b197b1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_b197b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_b197b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.glsl
index fbdb540..3978ef2 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/b85ebd.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_b85ebd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_b85ebd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.glsl
index d1f1797..66be1da 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/c22347.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_c22347();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_c22347();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.glsl
index 4941864..3dc1a97 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/cbdc70.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = inverseSqrt_cbdc70();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = inverseSqrt_cbdc70();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.glsl b/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.glsl
index 87afaba..e57bdd0 100644
--- a/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/inverseSqrt/f60c1c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   inverseSqrt_f60c1c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.glsl
index d06191c..453642e 100644
--- a/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/082c1f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_082c1f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_082c1f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.glsl
index 2150474..846bfaa 100644
--- a/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/217a31.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_217a31();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_217a31();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.glsl
index cf28a12..d5875c1 100644
--- a/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/2bfc68.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec2 res = ldexp(vec2(1.0f), arg_1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_2bfc68();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.glsl
index 4572e9e..b75de44 100644
--- a/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/2c6370.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_2c6370();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.glsl
index 11fecd8..968efaf 100644
--- a/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/376938.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec4 res = ldexp(vec4(1.0f), arg_1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_376938();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.glsl
index 5f97ac1..80e4ef5 100644
--- a/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/3d90b4.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_3d90b4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_3d90b4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.glsl
index c15ab68..8621dea 100644
--- a/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/4a3ad9.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_4a3ad9();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.glsl
index 78a0c51..fdd2d75 100644
--- a/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/593ff3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_593ff3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_593ff3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.glsl
index 5022d4a..cecfae7 100644
--- a/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/624e0c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_624e0c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_624e0c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.glsl
index c76327d..7d5ffe1 100644
--- a/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/65a7bd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_65a7bd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_65a7bd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.glsl
index a2ed909..538f05f 100644
--- a/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/71ebe3.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   float res = ldexp(1.0f, arg_1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_71ebe3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.glsl
index 2db5797..87d1c91 100644
--- a/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/7485ce.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_7485ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_7485ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.glsl
index c2381af..6001c06 100644
--- a/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/7fa13c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_7fa13c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_7fa13c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.glsl
index d68866d..8ce2c9d 100644
--- a/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/8a0c2f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_8a0c2f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_8a0c2f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.glsl
index 074aae5..b3092e1 100644
--- a/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/8e43e9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_8e43e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_8e43e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.glsl
index bd79a1a..b527543 100644
--- a/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/a22679.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_a22679();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_a22679();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.glsl
index ebf60ab..1f2fb99 100644
--- a/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/a31cdc.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_a31cdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_a31cdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.glsl
index e2df066..08e143f 100644
--- a/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/a6126e.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec3 res = ldexp(vec3(1.0f), arg_1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_a6126e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.glsl
index a53c1bc..f3e671e 100644
--- a/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/abd718.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_abd718();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_abd718();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.glsl
index 2b0b612..b7e5797 100644
--- a/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/c9d0b7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_c9d0b7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_c9d0b7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.glsl
index 0e37845..ca9415e 100644
--- a/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/cb0faf.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(2.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_cb0faf();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.glsl
index 3464af7..fa20b9b 100644
--- a/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/cc9cde.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_cc9cde();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_cc9cde();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.glsl
index a4f47db..409608f 100644
--- a/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/db8b49.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = ldexp_db8b49();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = ldexp_db8b49();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.glsl b/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.glsl
index 659009e..1b62dcc 100644
--- a/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/ldexp/fdbc7b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 2.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   ldexp_fdbc7b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/length/056071.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/056071.wgsl.expected.glsl
index e90ff95..0108a8c 100644
--- a/test/tint/builtins/gen/var/length/056071.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/056071.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_056071();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_056071();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.glsl
index b712d90..d1c4f6f 100644
--- a/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/3f0e13.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_3f0e13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_3f0e13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/555aba.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/555aba.wgsl.expected.glsl
index 9512d5f..987d6ee 100644
--- a/test/tint/builtins/gen/var/length/555aba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/555aba.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_555aba();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.glsl
index f8252be..fd499fa 100644
--- a/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/5b1a9b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_5b1a9b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_5b1a9b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/602a17.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/602a17.wgsl.expected.glsl
index 7a43e6d..7ee3926 100644
--- a/test/tint/builtins/gen/var/length/602a17.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/602a17.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_602a17();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_602a17();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.glsl
index f0013e3..87d36f4 100644
--- a/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/7b4741.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_7b4741();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.glsl
index 503cd1a..303028d 100644
--- a/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/936ad5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_936ad5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.glsl
index e31be9b..70e42ac 100644
--- a/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/afde8b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_afde8b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_afde8b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.glsl
index f117e2d..a8a9611 100644
--- a/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/ba16d6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_ba16d6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_ba16d6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/becebf.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/becebf.wgsl.expected.glsl
index f549f6d..aebd9e4 100644
--- a/test/tint/builtins/gen/var/length/becebf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/becebf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_becebf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_becebf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/c158da.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/c158da.wgsl.expected.glsl
index 93b435f..fdb5fa5 100644
--- a/test/tint/builtins/gen/var/length/c158da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/c158da.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = length_c158da();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = length_c158da();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.glsl b/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.glsl
index d0ad26a..f60137f 100644
--- a/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/length/c2c544.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   length_c2c544();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.glsl
index 2aeda08..b844c62 100644
--- a/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/3da25a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_3da25a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_3da25a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/655989.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/655989.wgsl.expected.glsl
index 1b83e84..964ee61 100644
--- a/test/tint/builtins/gen/var/log/655989.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/655989.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_655989();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.glsl
index a219be3c..4e80bc2 100644
--- a/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/697e1d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_697e1d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.glsl
index 4786e9f..6e065db 100644
--- a/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/6ff86f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_6ff86f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_6ff86f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.glsl
index 7abb3f4..764e902 100644
--- a/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/7114a6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_7114a6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_7114a6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.glsl
index 392fad0..721f93a 100644
--- a/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/8f0e32.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_8f0e32();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_8f0e32();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.glsl
index 2aa1d34..d6e0ad9 100644
--- a/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/b2ce28.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_b2ce28();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_b2ce28();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.glsl
index fe47a07..19094de 100644
--- a/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/b8088d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_b8088d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.glsl
index b1136fc..4371038 100644
--- a/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/c9f489.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_c9f489();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_c9f489();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.glsl
index f65c8fd..1cc1c85 100644
--- a/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/cdbdc1.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_cdbdc1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_cdbdc1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.glsl
index 66bc7d6..df34736 100644
--- a/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/f4c570.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log_f4c570();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log_f4c570();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.glsl b/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.glsl
index 68faad1..8cf35f1 100644
--- a/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log/f60cc7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log_f60cc7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.glsl
index 9bc9523..fb0e0d6 100644
--- a/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/0fbd39.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_0fbd39();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.glsl
index 58086b55..171c0ba 100644
--- a/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/38b478.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_38b478();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_38b478();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.glsl
index 6fcc7cf..83bf591 100644
--- a/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/4036ed.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_4036ed();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_4036ed();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.glsl
index 3ee7934..ca930c4 100644
--- a/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/5b464b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_5b464b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.glsl
index 4bc9e4b..8836fda 100644
--- a/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/6b8954.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_6b8954();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log2/776088.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/776088.wgsl.expected.glsl
index 024bd65..b7640b0 100644
--- a/test/tint/builtins/gen/var/log2/776088.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/776088.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_776088();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_776088();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.glsl
index 8492716..788393a 100644
--- a/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/8c10b3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_8c10b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_8c10b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/902988.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/902988.wgsl.expected.glsl
index d6d3ef4..52c67cd 100644
--- a/test/tint/builtins/gen/var/log2/902988.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/902988.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_902988();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_902988();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.glsl
index 89210cb..6b2fb02 100644
--- a/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/a52bbb.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   log2_a52bbb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.glsl
index 688d2c7..4e9ffdf 100644
--- a/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/adb233.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_adb233();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_adb233();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.glsl
index 4df0da5..ed081e4 100644
--- a/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/aea659.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_aea659();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_aea659();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.glsl b/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.glsl
index cf4aedd..07b4fc5 100644
--- a/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/log2/fb9f0b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = log2_fb9f0b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = log2_fb9f0b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.glsl
index 093b25c..d96f478 100644
--- a/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/067f3a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_067f3a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.glsl
index aea6920..2807035 100644
--- a/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/0c0aae.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_0c0aae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_0c0aae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.glsl
index 0822e71..96979b5 100644
--- a/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/111ac0.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_111ac0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_111ac0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/19070a.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/19070a.wgsl.expected.glsl
index 0caf243..be826b6 100644
--- a/test/tint/builtins/gen/var/max/19070a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/19070a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_19070a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.glsl
index 49f04d8..a280e3e 100644
--- a/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/25eafe.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_25eafe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_25eafe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/320815.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/320815.wgsl.expected.glsl
index 149346e..9b6b680 100644
--- a/test/tint/builtins/gen/var/max/320815.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/320815.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_320815();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_320815();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/34956e.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/34956e.wgsl.expected.glsl
index adffe40..4a521c39 100644
--- a/test/tint/builtins/gen/var/max/34956e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/34956e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_34956e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_34956e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/445169.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/445169.wgsl.expected.glsl
index 34ee3cc..18d765e 100644
--- a/test/tint/builtins/gen/var/max/445169.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/445169.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_445169();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_445169();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.glsl
index f58435f..bc79306 100644
--- a/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/44a39d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_44a39d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_44a39d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/453e04.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/453e04.wgsl.expected.glsl
index 0799961..59f1919 100644
--- a/test/tint/builtins/gen/var/max/453e04.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/453e04.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_453e04();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_453e04();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/462050.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/462050.wgsl.expected.glsl
index f0434b2..27a9b2a 100644
--- a/test/tint/builtins/gen/var/max/462050.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/462050.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_462050();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_462050();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/482d23.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/482d23.wgsl.expected.glsl
index 9137b51..62b61d7 100644
--- a/test/tint/builtins/gen/var/max/482d23.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/482d23.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_482d23();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.glsl
index ba5264a..200c66a 100644
--- a/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/4883ac.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_4883ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_4883ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.glsl
index 11b6e1c..b5ab258 100644
--- a/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/4bbff2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_4bbff2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.glsl
index 45ee6c9..bd91976 100644
--- a/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/85e6bc.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_85e6bc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_85e6bc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.glsl
index e9ec136..4f8cefb 100644
--- a/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/a1b196.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_a1b196();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/a93419.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/a93419.wgsl.expected.glsl
index 5c14847..21e6b54 100644
--- a/test/tint/builtins/gen/var/max/a93419.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/a93419.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_a93419();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_a93419();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.glsl
index c9234ad..254246b 100644
--- a/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/b1b73a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_b1b73a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_b1b73a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.glsl
index a4a749d..e905352 100644
--- a/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/c023dd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_c023dd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.glsl
index c32dbd9..0287cd3 100644
--- a/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/caa3d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_caa3d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.glsl
index eed0dad..c8b97e0 100644
--- a/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/ce7c30.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_ce7c30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_ce7c30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.glsl
index 305cf9c..e32d6cf 100644
--- a/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/de6b87.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   max_de6b87();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.glsl
index c2b3035..71f0b90 100644
--- a/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/e14f2b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_e14f2b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_e14f2b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.glsl b/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.glsl
index 85f59fb..a12ae76 100644
--- a/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/max/e8192f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = max_e8192f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = max_e8192f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.glsl
index cdba6d9..72ee4b6 100644
--- a/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/03c7e3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_03c7e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_03c7e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.glsl
index 2085dfd..0da8513 100644
--- a/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/0dc614.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_0dc614();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_0dc614();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/364910.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/364910.wgsl.expected.glsl
index d9e092d..455fb80 100644
--- a/test/tint/builtins/gen/var/min/364910.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/364910.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_364910();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.glsl
index 84cb1f5..e1e69f2 100644
--- a/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/371bd6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_371bd6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.glsl
index caf53d3..55113bb 100644
--- a/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/3941e1.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_3941e1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_3941e1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.glsl
index 6c03cc5..626bb35 100644
--- a/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/46c5d3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_46c5d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_46c5d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/527b79.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/527b79.wgsl.expected.glsl
index be0804a..4c824cd 100644
--- a/test/tint/builtins/gen/var/min/527b79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/527b79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_527b79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/717257.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/717257.wgsl.expected.glsl
index d999a7e..a533c10 100644
--- a/test/tint/builtins/gen/var/min/717257.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/717257.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_717257();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/794711.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/794711.wgsl.expected.glsl
index 84788de..8c997a6 100644
--- a/test/tint/builtins/gen/var/min/794711.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/794711.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_794711();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.glsl
index fecf014..34e637d 100644
--- a/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/7c710a.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_7c710a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_7c710a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.glsl
index 38c06e2..14859a6 100644
--- a/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/82b28f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_82b28f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_82b28f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.glsl
index f14d0c3..6495306 100644
--- a/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/84c9fe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_84c9fe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.glsl
index 6c5b0ad..0a00fdc 100644
--- a/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/93cfc4.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_93cfc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_93cfc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/98e797.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/98e797.wgsl.expected.glsl
index aa32c2f..d463d6c 100644
--- a/test/tint/builtins/gen/var/min/98e797.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/98e797.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_98e797();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/a45171.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/a45171.wgsl.expected.glsl
index 6ed183e..655c79f 100644
--- a/test/tint/builtins/gen/var/min/a45171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/a45171.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_a45171();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_a45171();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.glsl
index e20f6e5..80b2cf9 100644
--- a/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/aa28ad.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_aa28ad();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_aa28ad();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.glsl
index d9cf4aa..a4acd56 100644
--- a/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/ab0acd.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_ab0acd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_ab0acd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.glsl
index 6059330..c6c0517 100644
--- a/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/ac84d6.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_ac84d6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_ac84d6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/af326d.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/af326d.wgsl.expected.glsl
index c5c7779..4417edd 100644
--- a/test/tint/builtins/gen/var/min/af326d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/af326d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_af326d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_af326d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/af364e.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/af364e.wgsl.expected.glsl
index a46c24a..8bd5bfc 100644
--- a/test/tint/builtins/gen/var/min/af364e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/af364e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   min_af364e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.glsl
index 0e8bd7d..7761fcf 100644
--- a/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/c70bb7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c70bb7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c70bb7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/c73147.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/c73147.wgsl.expected.glsl
index d7632a9..9bea318 100644
--- a/test/tint/builtins/gen/var/min/c73147.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/c73147.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c73147();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c73147();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.glsl
index 87703af..65c8d7b 100644
--- a/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/c76fa6.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_c76fa6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_c76fa6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.glsl
index a0e154b..aa53e48 100644
--- a/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/min/e780f9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = min_e780f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = min_e780f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.glsl
index 0f42f0b..aae6399 100644
--- a/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/0c8c33.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_0c8c33();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_0c8c33();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.glsl
index d16cc2d..770c4fa 100644
--- a/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/1faeb1.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_1faeb1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_1faeb1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.glsl
index c44e404..0557a5b 100644
--- a/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/275cac.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_275cac();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.glsl
index 3cd713e..92b2bea 100644
--- a/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/2fadab.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_2fadab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_2fadab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.glsl
index 44db189..5aaf1fc 100644
--- a/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/30de36.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_30de36();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/315264.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/315264.wgsl.expected.glsl
index 6a42113..ca687e9 100644
--- a/test/tint/builtins/gen/var/mix/315264.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/315264.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_315264();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_315264();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.glsl
index fae8681..c8e9df6 100644
--- a/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/343c49.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_343c49();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.glsl
index 6f2f517..bf7c686 100644
--- a/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/38cbbb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_38cbbb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_38cbbb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.glsl
index 00aef64..7a2b28a 100644
--- a/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/42d11d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_42d11d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.glsl
index b25489e..152f01c 100644
--- a/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/4f0b5e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_4f0b5e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_4f0b5e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.glsl
index b9cf6f3..aaddaa5 100644
--- a/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/63f2fd.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_63f2fd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_63f2fd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.glsl
index e5f6290..ee2bc99 100644
--- a/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/6f8adc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_6f8adc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_6f8adc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.glsl
index fdacfa2..ad6484f 100644
--- a/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/98007a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_98007a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.glsl
index ff5e10f..f3592eb 100644
--- a/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/98ee3e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_98ee3e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_98ee3e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.glsl
index a084d1a..a873075 100644
--- a/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/9c2681.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_9c2681();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.glsl
index 1ca2daf..a185d4b 100644
--- a/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/c1aec6.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_c1aec6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_c1aec6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.glsl
index 7902c2e..39e5fcb 100644
--- a/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/c37ede.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_c37ede();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_c37ede();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.glsl
index 49147c8..7c7ff1a 100644
--- a/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/e46a83.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_e46a83();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_e46a83();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.glsl
index 9b03f7d..afd73c5 100644
--- a/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/ee2468.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_ee2468();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_ee2468();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.glsl
index fc304e3..f0b3132 100644
--- a/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/ef3575.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   mix_ef3575();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.glsl b/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.glsl
index fc04ac3..4bc6062 100644
--- a/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/mix/f1a543.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = mix_f1a543();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = mix_f1a543();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
index 51d8b26..4eb4486 100644
--- a/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
 void modf_2d50da() {
   vec2 arg_0 = vec2(-1.5f);
   modf_result_vec2_f32 v = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
 void modf_2d50da() {
   vec2 arg_0 = vec2(-1.5f);
   modf_result_vec2_f32 v = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,7 +48,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -59,14 +59,14 @@
 void modf_2d50da() {
   vec2 arg_0 = vec2(-1.5f);
   modf_result_vec2_f32 v = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_2d50da();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.glsl
index f103aa1..d0d8d37 100644
--- a/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/45005f.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
 void modf_45005f() {
   f16vec3 arg_0 = f16vec3(-1.5hf);
   modf_result_vec3_f16 v = modf_result_vec3_f16(f16vec3(0.0hf), f16vec3(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
 void modf_45005f() {
   f16vec3 arg_0 = f16vec3(-1.5hf);
   modf_result_vec3_f16 v = modf_result_vec3_f16(f16vec3(0.0hf), f16vec3(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,7 +51,7 @@
 
 
 struct modf_result_vec3_f16 {
-  f16vec3 fract;
+  f16vec3 member_0;
   f16vec3 whole;
 };
 
@@ -62,14 +62,14 @@
 void modf_45005f() {
   f16vec3 arg_0 = f16vec3(-1.5hf);
   modf_result_vec3_f16 v = modf_result_vec3_f16(f16vec3(0.0hf), f16vec3(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_45005f();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
index c50b1be..f1f9aa7 100644
--- a/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
 void modf_4bfced() {
   vec4 arg_0 = vec4(-1.5f);
   modf_result_vec4_f32 v = modf_result_vec4_f32(vec4(0.0f), vec4(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
 void modf_4bfced() {
   vec4 arg_0 = vec4(-1.5f);
   modf_result_vec4_f32 v = modf_result_vec4_f32(vec4(0.0f), vec4(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,7 +48,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -59,14 +59,14 @@
 void modf_4bfced() {
   vec4 arg_0 = vec4(-1.5f);
   modf_result_vec4_f32 v = modf_result_vec4_f32(vec4(0.0f), vec4(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_4bfced();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
index 92ca50e..36156c0 100644
--- a/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
 void modf_5ea256() {
   vec3 arg_0 = vec3(-1.5f);
   modf_result_vec3_f32 v = modf_result_vec3_f32(vec3(0.0f), vec3(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
 void modf_5ea256() {
   vec3 arg_0 = vec3(-1.5f);
   modf_result_vec3_f32 v = modf_result_vec3_f32(vec3(0.0f), vec3(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,7 +48,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -59,14 +59,14 @@
 void modf_5ea256() {
   vec3 arg_0 = vec3(-1.5f);
   modf_result_vec3_f32 v = modf_result_vec3_f32(vec3(0.0f), vec3(0.0f));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec3_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_5ea256();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.glsl
index f8e1458..9171311 100644
--- a/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/68d8ee.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec3_f32 {
-  vec3 fract;
+  vec3 member_0;
   vec3 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec3_f32 res = modf_result_vec3_f32(vec3(-0.5f), vec3(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_68d8ee();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.glsl
index 8ec8490..0aa494c 100644
--- a/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/732aa6.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec2_f32 res = modf_result_vec2_f32(vec2(-0.5f), vec2(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_732aa6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.glsl
index 3119c59..831e62e 100644
--- a/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/8dbbbf.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
 void modf_8dbbbf() {
   float16_t arg_0 = -1.5hf;
   modf_result_f16 v = modf_result_f16(0.0hf, 0.0hf);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
 void modf_8dbbbf() {
   float16_t arg_0 = -1.5hf;
   modf_result_f16 v = modf_result_f16(0.0hf, 0.0hf);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,7 +51,7 @@
 
 
 struct modf_result_f16 {
-  float16_t fract;
+  float16_t member_0;
   float16_t whole;
 };
 
@@ -62,14 +62,14 @@
 void modf_8dbbbf() {
   float16_t arg_0 = -1.5hf;
   modf_result_f16 v = modf_result_f16(0.0hf, 0.0hf);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_8dbbbf();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/995934.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/995934.wgsl.expected.glsl
index 0fa026d..8dd0704 100644
--- a/test/tint/builtins/gen/var/modf/995934.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/995934.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
 void modf_995934() {
   f16vec4 arg_0 = f16vec4(-1.5hf);
   modf_result_vec4_f16 v = modf_result_vec4_f16(f16vec4(0.0hf), f16vec4(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
 void modf_995934() {
   f16vec4 arg_0 = f16vec4(-1.5hf);
   modf_result_vec4_f16 v = modf_result_vec4_f16(f16vec4(0.0hf), f16vec4(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,7 +51,7 @@
 
 
 struct modf_result_vec4_f16 {
-  f16vec4 fract;
+  f16vec4 member_0;
   f16vec4 whole;
 };
 
@@ -62,14 +62,14 @@
 void modf_995934() {
   f16vec4 arg_0 = f16vec4(-1.5hf);
   modf_result_vec4_f16 v = modf_result_vec4_f16(f16vec4(0.0hf), f16vec4(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec4_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_995934();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.glsl
index c4018bd..68ce272 100644
--- a/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/a545b9.wgsl.expected.glsl
@@ -8,14 +8,14 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
 void modf_a545b9() {
   f16vec2 arg_0 = f16vec2(-1.5hf);
   modf_result_vec2_f16 v = modf_result_vec2_f16(f16vec2(0.0hf), f16vec2(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f16 res = v;
 }
 void main() {
@@ -29,14 +29,14 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
 void modf_a545b9() {
   f16vec2 arg_0 = f16vec2(-1.5hf);
   modf_result_vec2_f16 v = modf_result_vec2_f16(f16vec2(0.0hf), f16vec2(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f16 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -51,7 +51,7 @@
 
 
 struct modf_result_vec2_f16 {
-  f16vec2 fract;
+  f16vec2 member_0;
   f16vec2 whole;
 };
 
@@ -62,14 +62,14 @@
 void modf_a545b9() {
   f16vec2 arg_0 = f16vec2(-1.5hf);
   modf_result_vec2_f16 v = modf_result_vec2_f16(f16vec2(0.0hf), f16vec2(0.0hf));
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_vec2_f16 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_a545b9();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
index 5c1c827..e164e9e 100644
--- a/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
@@ -7,14 +7,14 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 void modf_bbf7f7() {
   float arg_0 = -1.5f;
   modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f32 res = v;
 }
 void main() {
@@ -27,14 +27,14 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 void modf_bbf7f7() {
   float arg_0 = -1.5f;
   modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f32 res = v;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -48,7 +48,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -59,14 +59,14 @@
 void modf_bbf7f7() {
   float arg_0 = -1.5f;
   modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(arg_0, v.whole);
+  v.member_0 = modf(arg_0, v.whole);
   modf_result_f32 res = v;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v_1 = VertexOutput(vec4(0.0f));
+  v_1.pos = vec4(0.0f);
   modf_bbf7f7();
-  return tint_symbol;
+  return v_1;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.glsl
index ff8e130..654ad99 100644
--- a/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/c15f48.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_f32 res = modf_result_f32(-0.5f, -1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_c15f48();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.glsl
index 01eb486..85eda3a 100644
--- a/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/f3d1f9.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -24,7 +24,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -42,7 +42,7 @@
 
 
 struct modf_result_vec4_f32 {
-  vec4 fract;
+  vec4 member_0;
   vec4 whole;
 };
 
@@ -54,10 +54,10 @@
   modf_result_vec4_f32 res = modf_result_vec4_f32(vec4(-0.5f), vec4(-1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   modf_f3d1f9();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.glsl
index f5d585c..301c4df 100644
--- a/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/39d5ec.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_39d5ec();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_39d5ec();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.glsl
index 2f2d4b3..ef93e7d 100644
--- a/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/4eaf61.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_4eaf61();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.glsl
index 696567c..174e500 100644
--- a/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/584e47.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.70710676908493041992f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_584e47();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.glsl
index 598b905..55d33c9 100644
--- a/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/64d8c0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_64d8c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_64d8c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.glsl
index da1536e..e68aac2 100644
--- a/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/7990f3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_7990f3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_7990f3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.glsl
index e277baa..1bd3628 100644
--- a/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/9a0aab.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_9a0aab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_9a0aab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.glsl
index 9cc1287..79fd1c4 100644
--- a/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/b8cb8d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_b8cb8d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_b8cb8d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.glsl
index 1932078..8b9f618 100644
--- a/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/e7def8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.57735025882720947266f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   normalize_e7def8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.glsl b/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.glsl
index 422f501..f8f138c 100644
--- a/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/normalize/fc2ef1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = normalize_fc2ef1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = normalize_fc2ef1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.glsl
index 521f1fa..3902527 100644
--- a/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack2x16float/0e97b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16float_0e97b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16float_0e97b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.glsl
index d987b51..6253068 100644
--- a/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack2x16snorm/6c169b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16snorm_6c169b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16snorm_6c169b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.glsl
index 715481f..7b53113 100644
--- a/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack2x16unorm/0f08e4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack2x16unorm_0f08e4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack2x16unorm_0f08e4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.glsl
index 9e80fb8..61a1bfb 100644
--- a/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4x8snorm/4d22e7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4x8snorm_4d22e7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4x8snorm_4d22e7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.glsl
index 39f94fe..cfe6e6f 100644
--- a/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4x8unorm/95c456.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4x8unorm_95c456();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pack4x8unorm_95c456();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.glsl
index 21eb875..72ab888 100644
--- a/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4xI8/bfce01.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xI8_bfce01();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0u);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = pack4xI8_bfce01();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
index f97cac9..95964ca 100644
--- a/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4xI8Clamp/e42b2a.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xI8Clamp_e42b2a();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0u);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = pack4xI8Clamp_e42b2a();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.glsl
index f9635e2..fd316be 100644
--- a/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4xU8/b70b53.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xU8_b70b53();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0u);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = pack4xU8_b70b53();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl b/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
index ebfbe40..49371e3 100644
--- a/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pack4xU8Clamp/6b8c1b.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pack4xU8Clamp_6b8c1b();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0u);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = pack4xU8Clamp_6b8c1b();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.glsl
index 8778eae..999f71c 100644
--- a/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/04a908.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_04a908();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_04a908();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.glsl
index 659dffb..72abc64 100644
--- a/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/46e029.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_46e029();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_46e029();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.glsl
index 43ad9d9..5094794 100644
--- a/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/4a46c9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_4a46c9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_4a46c9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.glsl
index 03dc3d7..3185068 100644
--- a/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/4f33b2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_4f33b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_4f33b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.glsl
index 2e02cdf..6dd9e74 100644
--- a/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/749c42.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_749c42();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.glsl
index 808feb0..c787e86 100644
--- a/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/a8f6b2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_a8f6b2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.glsl
index d95d3c4..3608130 100644
--- a/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/bc91ed.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_bc91ed();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.glsl
index 2edc64b..86ad903 100644
--- a/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/ce9ef5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_ce9ef5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_ce9ef5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.glsl
index de5ba33..ade1142 100644
--- a/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/e42f20.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   pow_e42f20();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.glsl
index b15dbcb..8c794b2 100644
--- a/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/e60ea5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_e60ea5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_e60ea5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.glsl
index 39b47d1..bb4a25b 100644
--- a/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/f37b25.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_f37b25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_f37b25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.glsl b/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.glsl
index 2c86a71..13aa9e2 100644
--- a/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/pow/fa5429.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = pow_fa5429();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = pow_fa5429();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.glsl b/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.glsl
index 7e86c26..3b56f8c 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/quantizeToF16/12e50e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_12e50e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_12e50e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.glsl b/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.glsl
index 20c57fa..c66277d 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/quantizeToF16/2cddf3.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_2cddf3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_2cddf3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.glsl b/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.glsl
index 3211775..1b3099f 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/quantizeToF16/cba294.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_cba294();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_cba294();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.glsl b/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.glsl
index f2bce95..d358199 100644
--- a/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/quantizeToF16/e8fd14.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = quantizeToF16_e8fd14();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = quantizeToF16_e8fd14();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.glsl
index 60fb24b..f78294c 100644
--- a/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/09b7fc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_09b7fc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_09b7fc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.glsl
index 5181bfa..ae44d56 100644
--- a/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/208fd9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_208fd9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_208fd9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/379214.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/379214.wgsl.expected.glsl
index 3345eb5..fe31604 100644
--- a/test/tint/builtins/gen/var/radians/379214.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/379214.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_379214();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.glsl
index cefcdab..6f45d1a 100644
--- a/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/44a9f8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_44a9f8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.glsl
index cc67f0c..721dfed 100644
--- a/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/44f20b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_44f20b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_44f20b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.glsl
index b9a1b2c..e9e1247 100644
--- a/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/524a91.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.01745329238474369049f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_524a91();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.glsl
index fbc3955..6aa6cf8 100644
--- a/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/61687a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_61687a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_61687a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.glsl
index 2cbe623..e6cf2a0 100644
--- a/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/6b0ff2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_6b0ff2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_6b0ff2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.glsl
index a43acf1..2842e8f 100644
--- a/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/7ea4c7.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_7ea4c7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_7ea4c7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.glsl
index 1074da5..8e01116 100644
--- a/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/bff231.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.01745329238474369049f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   radians_bff231();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.glsl
index 261d15f..0bf6502 100644
--- a/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/f96258.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_f96258();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_f96258();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.glsl b/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.glsl
index 18f655c..3751da1 100644
--- a/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/radians/fbacf0.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = radians_fbacf0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = radians_fbacf0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.glsl
index ff82701..403f2b9 100644
--- a/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/05357e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_05357e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_05357e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.glsl
index 69c3719..8693a00 100644
--- a/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/310de5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_310de5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_310de5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.glsl
index de7b1fd..0d335f4 100644
--- a/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/61ca21.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_61ca21();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_61ca21();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.glsl
index 3b83fb5..bc17bc5 100644
--- a/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/a8baf2.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-5.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_a8baf2();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.glsl
index 73ebd8b..f1e5623 100644
--- a/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/b61e10.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_b61e10();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_b61e10();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.glsl
index 43a66fa..e830270 100644
--- a/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/bb15ac.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_bb15ac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_bb15ac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.glsl
index e105264..6090b69 100644
--- a/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/bba2d0.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-3.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_bba2d0();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.glsl
index 4ce8a61..2dd7daf 100644
--- a/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/d7e210.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-7.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   reflect_d7e210();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.glsl b/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.glsl
index a2e1260..14d9222 100644
--- a/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reflect/f47fdb.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reflect_f47fdb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reflect_f47fdb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.glsl
index fc2c053..0f16d55 100644
--- a/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/0594ba.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_0594ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_0594ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.glsl
index 84955d3..7bb12f8 100644
--- a/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/570cb3.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_570cb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_570cb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.glsl
index 316b8d5..9895caf 100644
--- a/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/7e02e6.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_7e02e6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_7e02e6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.glsl
index 93e30e2..ecdc75a 100644
--- a/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/8984af.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_8984af();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_8984af();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.glsl
index 0b88251..5d3f4bd 100644
--- a/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/8c192a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(-7.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_8c192a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.glsl
index d6ceaf80..e81dd7b 100644
--- a/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/cbc1d2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_cbc1d2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_cbc1d2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.glsl
index f1be1de..c410450 100644
--- a/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/cd905f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = refract_cd905f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = refract_cd905f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.glsl
index a65ca56..3d360c4 100644
--- a/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/cf1629.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(-3.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_cf1629();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.glsl b/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.glsl
index 018b4cd..4770ecb 100644
--- a/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/refract/d7569b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(-5.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   refract_d7569b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.glsl
index b3f4a50..30e8863 100644
--- a/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/222177.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_222177();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_222177();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.glsl
index 0d7d5a5..eff22e3 100644
--- a/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/35fea9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_35fea9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_35fea9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.glsl
index 601e500..6228d13 100644
--- a/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/4dbd6f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_4dbd6f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_4dbd6f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.glsl
index cc12b98..98cf7fe 100644
--- a/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/7c4269.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_7c4269();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_7c4269();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.glsl
index ab3676c..7ee49d6 100644
--- a/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/a6ccd4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_a6ccd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_a6ccd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.glsl
index 499f242..571817e 100644
--- a/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/c21bc1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_c21bc1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_c21bc1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.glsl
index 371a6fe..886218e 100644
--- a/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/e1f4c1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_e1f4c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_e1f4c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.glsl b/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.glsl
index a0475ea..2fa0967 100644
--- a/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/reverseBits/e31adf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = reverseBits_e31adf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = reverseBits_e31adf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.glsl
index a48391f..e77e9cd 100644
--- a/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/106c0b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_106c0b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_106c0b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.glsl
index 8989f40..f3c0d09 100644
--- a/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/184d5a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_184d5a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.glsl
index 4bb2bcf..b57eefb 100644
--- a/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/1c7897.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_1c7897();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_1c7897();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.glsl
index f4aee06..c314b48 100644
--- a/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/52c84d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_52c84d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_52c84d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.glsl
index 54658a2..02cc6f3 100644
--- a/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/773a8f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 4.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_773a8f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.glsl
index 2905ffc..6daf835 100644
--- a/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/8fdca3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_8fdca3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.glsl
index e9ddb1e..c83627d 100644
--- a/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/9078ef.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_9078ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_9078ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.glsl
index 7b14b27..93b02af 100644
--- a/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/9edc38.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_9edc38();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_9edc38();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.glsl
index b0776ed..7b5f661 100644
--- a/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/a1673d.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(4.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   round_a1673d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.glsl
index eea9657..0350f48 100644
--- a/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/d87e84.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_d87e84();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_d87e84();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.glsl
index 0b00f9d..c162ed1 100644
--- a/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/e1bba2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_e1bba2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_e1bba2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.glsl b/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.glsl
index 1c0d667..363e5a6 100644
--- a/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/round/f665b5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = round_f665b5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = round_f665b5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.glsl
index 12de324..3756da3 100644
--- a/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/270da5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_270da5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_270da5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.glsl
index 3da47dd..4386c5e 100644
--- a/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/462535.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_462535();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_462535();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.glsl
index 9db5286..e94b8cf 100644
--- a/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/4ed8d7.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_4ed8d7();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.glsl
index 1ef1348..8e5d023 100644
--- a/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/51567f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_51567f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_51567f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.glsl
index 78a741a..7e94752 100644
--- a/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/6bcddf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_6bcddf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_6bcddf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.glsl
index 48a6565..e2dc4fe 100644
--- a/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/78b37c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_78b37c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.glsl
index d9fbc66..abb9173 100644
--- a/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/a5b571.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_a5b571();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_a5b571();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.glsl
index 9f1e01f78..ef4e2cc 100644
--- a/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/cd2028.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_cd2028();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_cd2028();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.glsl
index 79d8bc8..4dd4536 100644
--- a/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/d55822.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_d55822();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.glsl
index 0f7562b..1663660 100644
--- a/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/dcde71.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_dcde71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_dcde71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.glsl
index 6dca2a4..0cc24d0 100644
--- a/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/e40fb6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   saturate_e40fb6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.glsl b/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.glsl
index baeef82..9289792 100644
--- a/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/saturate/e8df56.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = saturate_e8df56();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = saturate_e8df56();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/00b848.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/00b848.wgsl.expected.glsl
index 91caaba..edf065d 100644
--- a/test/tint/builtins/gen/var/select/00b848.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/00b848.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_00b848();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_00b848();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.glsl
index 7ffb425..26a5252 100644
--- a/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/01e2cd.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_01e2cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_01e2cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.glsl
index 69e099e..2698914 100644
--- a/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/087ea4.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_087ea4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_087ea4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/089657.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/089657.wgsl.expected.glsl
index c444744..f7930bd 100644
--- a/test/tint/builtins/gen/var/select/089657.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/089657.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec3 res = mix(vec3(1.0f), vec3(1.0f), bvec3(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_089657();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.glsl
index 6335a62..8996c9a 100644
--- a/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/10e73b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_10e73b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_10e73b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/17441a.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/17441a.wgsl.expected.glsl
index bec3500..9f1757c 100644
--- a/test/tint/builtins/gen/var/select/17441a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/17441a.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec4 res = mix(vec4(1.0f), vec4(1.0f), bvec4(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_17441a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.glsl
index b164b96..e0f2005 100644
--- a/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/1ada2a.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_1ada2a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_1ada2a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.glsl
index 48ca02b..9612e42 100644
--- a/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/1e960b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_1e960b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_1e960b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.glsl
index 0add398..fb08ffe 100644
--- a/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/1f4d93.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec2 res = mix(vec2(1.0f), vec2(1.0f), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_1f4d93();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/266aff.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/266aff.wgsl.expected.glsl
index 8bb6a8a..885c422 100644
--- a/test/tint/builtins/gen/var/select/266aff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/266aff.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_266aff();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_266aff();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.glsl
index 74406cf..9d4fb96 100644
--- a/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/28a27e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_28a27e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_28a27e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.glsl
index 07a1143..473f150 100644
--- a/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/2c96d4.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec3 res = mix(vec3(1.0f), vec3(1.0f), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_2c96d4();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.glsl
index 9a5f006..f76b539 100644
--- a/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/3a14be.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec2 res = mix(ivec2(1), ivec2(1), bvec2(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_3a14be();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.glsl
index b321696..b04b838 100644
--- a/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/3c25ce.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return mix(0, 1, all(equal(res, bvec3(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_3c25ce();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_3c25ce();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/416e14.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/416e14.wgsl.expected.glsl
index 5ac043f..0988b7b 100644
--- a/test/tint/builtins/gen/var/select/416e14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/416e14.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_416e14();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_416e14();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.glsl
index 99db359..f8abfcd 100644
--- a/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/431dfb.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec2 res = mix(ivec2(1), ivec2(1), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_431dfb();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/43741e.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/43741e.wgsl.expected.glsl
index 155bc82..165700f 100644
--- a/test/tint/builtins/gen/var/select/43741e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/43741e.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec4 res = mix(vec4(1.0f), vec4(1.0f), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_43741e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/494051.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/494051.wgsl.expected.glsl
index 261a49b..0c91deb 100644
--- a/test/tint/builtins/gen/var/select/494051.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/494051.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   float res = mix(1.0f, 1.0f, arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_494051();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.glsl
index 2f2abd8..91f9fb8 100644
--- a/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/4c4738.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec4 res = mix(ivec4(1), ivec4(1), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_4c4738();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.glsl
index 257eae5..285fbe5 100644
--- a/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/4e60da.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   vec2 res = mix(vec2(1.0f), vec2(1.0f), bvec2(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_4e60da();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/51b047.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/51b047.wgsl.expected.glsl
index 83d6f04..7f1e1c0 100644
--- a/test/tint/builtins/gen/var/select/51b047.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/51b047.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_51b047();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_51b047();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/53d518.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/53d518.wgsl.expected.glsl
index 7946e8a..74841a6 100644
--- a/test/tint/builtins/gen/var/select/53d518.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/53d518.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_53d518();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_53d518();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/713567.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/713567.wgsl.expected.glsl
index 077ef68..085ca36 100644
--- a/test/tint/builtins/gen/var/select/713567.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/713567.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_713567();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_713567();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.glsl
index b3b7c39..ee8dbd1 100644
--- a/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/78be5f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_78be5f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_78be5f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.glsl
index 099fcaf..6f39a29 100644
--- a/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/80a9a9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return mix(0, 1, all(equal(res, bvec3(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_80a9a9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_80a9a9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.glsl
index d13b679..9c3af76 100644
--- a/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/830dd9.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_830dd9();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_830dd9();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.glsl
index d8d533d..e4eca67 100644
--- a/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/86f9bd.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_86f9bd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_86f9bd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.glsl
index 415bd63..22194e5 100644
--- a/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/8fa62c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_8fa62c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec3(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_8fa62c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/99f883.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/99f883.wgsl.expected.glsl
index 0e626fa..fec0595 100644
--- a/test/tint/builtins/gen/var/select/99f883.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/99f883.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_99f883();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_99f883();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.glsl
index 9bcd969..8ee8c36 100644
--- a/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/9b478d.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   int res = mix(1, 1, arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_9b478d();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.glsl
index d1b321c..d4b809c 100644
--- a/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/a081f1.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_a081f1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_a081f1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.glsl
index f12549e..b2cefc0 100644
--- a/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/a2860e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_a2860e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_a2860e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.glsl
index dadbfb7..8e2b958 100644
--- a/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/ab069f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ab069f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_ab069f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/b04721.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/b04721.wgsl.expected.glsl
index 56eac9c..938be80 100644
--- a/test/tint/builtins/gen/var/select/b04721.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/b04721.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_b04721();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_b04721();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/b93806.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/b93806.wgsl.expected.glsl
index 979b5b3..16f205a 100644
--- a/test/tint/builtins/gen/var/select/b93806.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/b93806.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec3 res = mix(ivec3(1), ivec3(1), arg_2);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_b93806();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.glsl
index 2709f8c..324b8f8 100644
--- a/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/bb447f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bb447f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec2(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_bb447f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.glsl
index b2c714d..9f0b53c 100644
--- a/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/bb8aae.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bb8aae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_bb8aae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.glsl
index 06d8039..15c7234 100644
--- a/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/bf3d29.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_bf3d29();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_bf3d29();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.glsl
index d73d0ea..32faed5 100644
--- a/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/c31f9e.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return mix(0, 1, (res == false));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c31f9e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_c31f9e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.glsl
index 11c7fca..157013d 100644
--- a/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/c41bd1.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return mix(0, 1, all(equal(res, bvec4(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c41bd1();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_c41bd1();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.glsl
index 21c6eca..834f8ca 100644
--- a/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/c4a4ef.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_c4a4ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec4(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_c4a4ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.glsl
index d24f976..da617ab 100644
--- a/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/cb9301.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return mix(0, 1, all(equal(res, bvec2(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_cb9301();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_cb9301();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.glsl
index 799ef53..b230f86 100644
--- a/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/dfab3b.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec3 res = mix(ivec3(1), ivec3(1), bvec3(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_dfab3b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.glsl
index 0e65b7a..63bcd64 100644
--- a/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/e381c3.wgsl.expected.glsl
@@ -40,10 +40,10 @@
   ivec4 res = mix(ivec4(1), ivec4(1), bvec4(arg_2));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   select_e381c3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.glsl
index c1f9db5..55a38f6 100644
--- a/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/e3e028.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return mix(0, 1, all(equal(res, bvec4(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_e3e028();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_e3e028();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.glsl
index 04c6149..4218744 100644
--- a/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/ebfea2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ebfea2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ebfea2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.glsl
index 2bdccc4..1022db7 100644
--- a/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/ed7c13.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ed7c13();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ed7c13();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.glsl
index 8ddfd1d..a29e47d 100644
--- a/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/ed8a15.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_ed8a15();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = select_ed8a15();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.glsl b/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.glsl
index 35aa8cb..d1d0fa6 100644
--- a/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/select/fb7e53.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return mix(0, 1, all(equal(res, bvec2(false))));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = select_fb7e53();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = select_fb7e53();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.glsl
index 3f20e1f..a5c16a3 100644
--- a/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/0799fd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_0799fd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/159665.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/159665.wgsl.expected.glsl
index 97d9d4e..fa57b59 100644
--- a/test/tint/builtins/gen/var/sign/159665.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/159665.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_159665();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_159665();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/160933.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/160933.wgsl.expected.glsl
index 9822ea9..dffc98e 100644
--- a/test/tint/builtins/gen/var/sign/160933.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/160933.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_160933();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_160933();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.glsl
index 8f3dd03..c804b5c 100644
--- a/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/3233fa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_3233fa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_3233fa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.glsl
index 3848282..30d0f63 100644
--- a/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/3a39ac.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   int res = 1;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_3a39ac();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.glsl
index 7be9f6b..54c2f69 100644
--- a/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/3bdab6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec4 res = ivec4(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_3bdab6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.glsl
index b25aa25..ae4ff31 100644
--- a/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/55339e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec3 res = ivec3(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_55339e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.glsl
index 1cc63d5..5140515 100644
--- a/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/58d779.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_58d779();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec4(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_58d779();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.glsl
index eae79a9..e0ad9da 100644
--- a/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/5d283a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_5d283a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_5d283a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.glsl
index eabe620..73c55e0 100644
--- a/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/7c85ea.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_7c85ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_7c85ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/926015.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/926015.wgsl.expected.glsl
index e446848..b133cb8 100644
--- a/test/tint/builtins/gen/var/sign/926015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/926015.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec2(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_926015();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec2(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_926015();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.glsl
index b90ff43..b073f9a 100644
--- a/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/943b2e.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   ivec2 res = ivec2(1);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_943b2e();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.glsl
index dd94011..5b8eb3f 100644
--- a/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/9603b1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec3(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_9603b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), ivec3(0));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_9603b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.glsl
index 13c60a51..bd327fa 100644
--- a/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/ab6301.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_ab6301();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.glsl
index fe30723..d149ed5 100644
--- a/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/b8f634.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_b8f634();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_b8f634();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.glsl
index bf05791..e07aadf 100644
--- a/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/c8289c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_c8289c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.glsl
index b0c56d3..bc5f6db 100644
--- a/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/ccdb3c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_ccdb3c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_ccdb3c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.glsl
index b8888c8..ed88a4a 100644
--- a/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/d065d8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_d065d8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_d065d8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.glsl
index c4c6dd1b..e9ae1fa 100644
--- a/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/dd790e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sign_dd790e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sign_dd790e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.glsl b/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.glsl
index e967e30..6115b0f 100644
--- a/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sign/f5da6a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sign_f5da6a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.glsl
index 2313618..2b41d4d 100644
--- a/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/01f241.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_01f241();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_01f241();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.glsl
index d175ca7..d31686e 100644
--- a/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/15b2c6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_15b2c6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.glsl
index 7044047..f9a6c54 100644
--- a/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/2c903b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_2c903b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_2c903b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.glsl
index 3b9ab6c..c77bdb4 100644
--- a/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/3cca11.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_3cca11();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_3cca11();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.glsl
index 19915e0..0f38bbf 100644
--- a/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/4e3979.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_4e3979();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_4e3979();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.glsl
index 458d052..ba874a8 100644
--- a/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/5c0712.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_5c0712();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_5c0712();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.glsl
index ac6193a..0aac452 100644
--- a/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/66a59f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_66a59f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_66a59f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.glsl
index 1bd34cb..5b86cd7 100644
--- a/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/67b03c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_67b03c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.glsl
index 68521cd..876498e 100644
--- a/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/68d3ab.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_68d3ab();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.glsl
index 19b00a5..33b271a 100644
--- a/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/a9ab19.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sin_a9ab19();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.glsl
index 63004a9..0947e3f 100644
--- a/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/b78c91.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_b78c91();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_b78c91();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.glsl b/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.glsl
index 778e6ab..24acb76 100644
--- a/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sin/fc8bc4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sin_fc8bc4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sin_fc8bc4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.glsl
index 129ef60..506acf9 100644
--- a/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/0908c1.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_0908c1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_0908c1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.glsl
index e69b864..dafc6857 100644
--- a/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/445e33.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_445e33();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_445e33();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.glsl
index 4045cdb..852f456 100644
--- a/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/69cce2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_69cce2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_69cce2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.glsl
index 9ffa5f8..45a7053 100644
--- a/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/77a2a3.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_77a2a3();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.glsl
index bcbc5c8..8e607aa 100644
--- a/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/7bb598.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_7bb598();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_7bb598();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.glsl
index a4b21b2..d850822 100644
--- a/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/924f19.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_924f19();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_924f19();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.glsl
index dbd54c8..2c836fc 100644
--- a/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/9c1092.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_9c1092();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.glsl
index b89578d..cb02562 100644
--- a/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/a3da7c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.17520117759704589844f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_a3da7c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.glsl
index b969ee3..695aa46 100644
--- a/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/b9860e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_b9860e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_b9860e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.glsl
index 1e41bbf..8d554b0 100644
--- a/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/ba7e25.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_ba7e25();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_ba7e25();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.glsl
index da38be9..9381fcc 100644
--- a/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/c4df74.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.17520117759704589844f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sinh_c4df74();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.glsl b/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.glsl
index 72cbc81..acf8d3d 100644
--- a/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sinh/c9a5eb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sinh_c9a5eb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sinh_c9a5eb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.glsl
index 44d3e53..6aac27e 100644
--- a/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/0c481b.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_0c481b();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.glsl
index 7582558..e6de1b3 100644
--- a/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/0c4ffc.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_0c4ffc();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.glsl
index 1bee9b7..119b198 100644
--- a/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/12c031.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_12c031();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_12c031();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.glsl
index b9de436..2cc7264 100644
--- a/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/392c19.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_392c19();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_392c19();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.glsl
index 85f5ccb..55984c3 100644
--- a/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/40864c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_40864c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_40864c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.glsl
index 1a5d19a..59e788b 100644
--- a/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/586e12.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_586e12();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0hf);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_586e12();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.glsl
index b1edc7c..4aa1917 100644
--- a/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/66e4bd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.5f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_66e4bd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.glsl
index 539e6c9..ba423e0 100644
--- a/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/6c4975.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_6c4975();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_6c4975();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.glsl
index 4bfe098..7fa8902 100644
--- a/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/6e7a74.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_6e7a74();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_6e7a74();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.glsl
index 5597388..ca56600 100644
--- a/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/a80fff.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.5f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   smoothstep_a80fff();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.glsl
index 8ba61ac..89ca3b0 100644
--- a/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/aad1db.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_aad1db();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_aad1db();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.glsl b/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.glsl
index 00457be..02a0b47 100644
--- a/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/smoothstep/c43ebd.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = smoothstep_c43ebd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = smoothstep_c43ebd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.glsl
index 61d3e0f..c79e144 100644
--- a/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/072192.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_072192();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.glsl
index 9183565..eaba01f 100644
--- a/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/20c74e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_20c74e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_20c74e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.glsl
index ab7c021..de29645 100644
--- a/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/4ac2c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_4ac2c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.glsl
index bc0c295..fb362e3 100644
--- a/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/803d1c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_803d1c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_803d1c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.glsl
index c99389e..b361619 100644
--- a/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/895a0c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_895a0c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_895a0c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.glsl
index b8e2900..8cb2aaf 100644
--- a/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/8c7024.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_8c7024();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_8c7024();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.glsl
index e0374c4..8ea1cfe 100644
--- a/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/8da177.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_8da177();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.glsl
index 7d2dc0f..3778fcb 100644
--- a/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/9c5cbe.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   sqrt_9c5cbe();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.glsl
index ea3b889..5ebdde3 100644
--- a/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/aa0d7a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_aa0d7a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_aa0d7a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.glsl
index f03851c..78461df 100644
--- a/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/d9ab4d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_d9ab4d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_d9ab4d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.glsl
index 73d1254..9d7638e 100644
--- a/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/ec33e9.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_ec33e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_ec33e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.glsl b/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.glsl
index 5315183..758a20a 100644
--- a/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/sqrt/f8c59a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = sqrt_f8c59a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = sqrt_f8c59a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.glsl
index 2ea10b1..dc4a328 100644
--- a/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/07cb06.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_07cb06();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_07cb06();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.glsl
index b9e9543..60e388a 100644
--- a/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/0b073b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_0b073b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_0b073b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/19accd.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/19accd.wgsl.expected.glsl
index a8511ec..08c9af7 100644
--- a/test/tint/builtins/gen/var/step/19accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/19accd.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_19accd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_19accd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/334303.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/334303.wgsl.expected.glsl
index 38ae8a3..e60d066 100644
--- a/test/tint/builtins/gen/var/step/334303.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/334303.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_334303();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_334303();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.glsl
index 66bfb65..b4c0d00 100644
--- a/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/38cd79.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_38cd79();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/step/415879.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/415879.wgsl.expected.glsl
index 92bd5f7..61d0f73 100644
--- a/test/tint/builtins/gen/var/step/415879.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/415879.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_415879();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/step/630d07.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/630d07.wgsl.expected.glsl
index 04baded..c190dca 100644
--- a/test/tint/builtins/gen/var/step/630d07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/630d07.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_630d07();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_630d07();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.glsl
index a839fbb..32d19a7 100644
--- a/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/7c7e5c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_7c7e5c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/step/baa320.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/baa320.wgsl.expected.glsl
index 898fb0e..be7f13a 100644
--- a/test/tint/builtins/gen/var/step/baa320.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/baa320.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_baa320();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_baa320();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.glsl
index 284b60d..56df549 100644
--- a/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/cc6b61.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_cc6b61();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_cc6b61();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.glsl
index aa79ee7..3546036 100644
--- a/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/e2b337.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = step_e2b337();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = step_e2b337();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.glsl b/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.glsl
index 696679e..ae0f7ae 100644
--- a/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/step/f9b70c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   step_f9b70c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.glsl
index 5621646..cce7c54 100644
--- a/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/244e2a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_244e2a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_244e2a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.glsl
index 23949af..b301a7a 100644
--- a/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/2f030e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_2f030e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_2f030e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/311400.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/311400.wgsl.expected.glsl
index eed62d1..37e8423 100644
--- a/test/tint/builtins/gen/var/tan/311400.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/311400.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.55740773677825927734f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_311400();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.glsl
index 8da57ed..e89a3cb 100644
--- a/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/539e54.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_539e54();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_539e54();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.glsl
index c31a17a..e4dd2b2 100644
--- a/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/7be368.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_7be368();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.glsl
index 0d46b55..85229b0 100644
--- a/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/7ea104.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_7ea104();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_7ea104();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.glsl
index cb6d223..b494afe 100644
--- a/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/8ce3e9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_8ce3e9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_8ce3e9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.glsl
index 738e514..521665f 100644
--- a/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/9f7c9c.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_9f7c9c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_9f7c9c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.glsl
index 1d37b21..247f641 100644
--- a/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/a0966f.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_a0966f();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.glsl
index eec275a..e73d30f 100644
--- a/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/ae26ae.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.55740773677825927734f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tan_ae26ae();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.glsl
index 0069549..baa6cf3 100644
--- a/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/d4d491.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_d4d491();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_d4d491();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.glsl b/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.glsl
index 0c9f8fd..6ab06f3 100644
--- a/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tan/db0456.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tan_db0456();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tan_db0456();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.glsl
index 3f9b39a..d39b73f 100644
--- a/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/06a4fe.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_06a4fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_06a4fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.glsl
index 6f39f1b..22469fd 100644
--- a/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/313aa1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 0.76159417629241943359f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_313aa1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.glsl
index c64a67d..9f58f9d 100644
--- a/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/5663c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5663c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5663c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.glsl
index f62c495..f272f4e 100644
--- a/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/5724b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5724b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5724b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.glsl
index 40895f7..bdeb5ce 100644
--- a/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/5b19af.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_5b19af();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_5b19af();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.glsl
index 188634b..f0d49e1 100644
--- a/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/6289fd.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_6289fd();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.glsl
index a7ed626..c27f43a 100644
--- a/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/6d105a.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_6d105a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_6d105a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.glsl
index e3ac92c..1ac822f 100644
--- a/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/9f9fb9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_9f9fb9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_9f9fb9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.glsl
index d3e3dbd..2093a75 100644
--- a/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/ac5d33.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_ac5d33();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.glsl
index 18ee907..8743c18 100644
--- a/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/c15fdb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_c15fdb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_c15fdb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.glsl
index 3fc4723..1f8677a 100644
--- a/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/c48aa6.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(0.76159417629241943359f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   tanh_c48aa6();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.glsl b/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.glsl
index 4b1b58a..e2a229f 100644
--- a/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/tanh/e8efb3.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = tanh_e8efb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = tanh_e8efb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.glsl
index 0492c12..8cc7c37 100644
--- a/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/00229f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_00229f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_00229f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.glsl
index 88bc07f..0636e9c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/00348c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_00348c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_00348c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
index 99fc6e8..c8b682b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_022903();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_022903();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.glsl
index 2c0ad91..92f46fd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0329b0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0329b0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_0329b0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.glsl
index 4f27ccb..d1725df 100644
--- a/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/033ea7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_033ea7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_033ea7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.glsl
index 0a03fea..0f5705c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/07f1ba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_07f1ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_07f1ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.glsl
index 9da16a5..6bdae63 100644
--- a/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/088918.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_088918();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_088918();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
index 2107c4f..9baa7fb 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0890c6.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0890c6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_0890c6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.glsl
index 8cc9800..37af870 100644
--- a/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/08e371.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_08e371();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_08e371();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.glsl
index c7ae652..47feb85 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0d4a7c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0d4a7c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_0d4a7c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
index 53aa74a..a803008 100644
--- a/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/0ff9a4.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_0ff9a4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_0ff9a4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.glsl
index 89c9a31..fd08006 100644
--- a/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/135176.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_135176();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_135176();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
index 60b0523..95c69b6 100644
--- a/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/13f8db.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_13f8db();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_13f8db();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
index f440de2..721d401 100644
--- a/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/15b577.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_15b577();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_15b577();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.glsl
index dd774f4..0abd398 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1a2be7.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1a2be7();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_1a2be7();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.glsl
index 08845e3..c170fd7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1b720f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1b720f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_1b720f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
index 3143406..798ea58 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1bc428.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1bc428();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_1bc428();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
index f9496c3..a432bfb 100644
--- a/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/1bd78c.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_1bd78c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_1bd78c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.glsl
index bcb329a..2fbaea9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/212362.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_212362();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_212362();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
index e1b29d4..1c18841 100644
--- a/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/22b5b6.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCubeArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_22b5b6();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_22b5b6();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.glsl
index 81cd0c9..b80d418 100644
--- a/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/24db07.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_24db07();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_24db07();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.glsl
index e885163..d5bb08d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/268ddb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_268ddb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_268ddb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl
index 4b11504..090d1c1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_26d6bf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_26d6bf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.glsl
index 9357dae..1052872 100644
--- a/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/284c27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_284c27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_284c27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.glsl
index a9b03e0..d273561 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2bafdf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2bafdf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2bafdf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.glsl
index 913de0b..041c47a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2dc5c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2dc5c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2dc5c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
index eea6d24..44359bb 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2e443d.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2e443d();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_2e443d();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
index 878d86f..4871b4a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2fd2a4.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2fd2a4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_2fd2a4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.glsl
index 1ceb084..5fde98d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/2ff32a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_2ff32a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_2ff32a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.glsl
index f44927e..21daa70 100644
--- a/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/305dd5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_305dd5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_305dd5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
index dbada7d..286dcea 100644
--- a/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/346fee.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_346fee();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_346fee();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
index 551e3fc..12da707 100644
--- a/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/382b16.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_382b16();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_382b16();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
index a502b9a..68fff3d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3963d0.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3963d0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_3963d0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.glsl
index c868830..f70f266 100644
--- a/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/397dab.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_397dab();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_397dab();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.glsl
index ef25dc2..68008c0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3b38f6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3b38f6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3b38f6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
index 425b42b..f7fe079 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3c66f0.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCubeArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3c66f0();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_3c66f0();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.glsl
index a9e4629..2e05867 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3f3474.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3f3474();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3f3474();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
index 3a78b99..44597d8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3fc3dc.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3fc3dc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_3fc3dc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.glsl
index 8e30728..ae0c10b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/3ff0a5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_3ff0a5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_3ff0a5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.glsl
index cc13068..b5c25db 100644
--- a/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/40da20.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_40da20();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_40da20();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.glsl
index 35565a0..4c4fb88 100644
--- a/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/423519.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_423519();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_423519();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.glsl
index 74aedfb..a50fe60 100644
--- a/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/445376.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_445376();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_445376();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.glsl
index 8646e8e..a29878c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/46f0fc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_46f0fc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_46f0fc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.glsl
index 5435217..9c7504b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/4716a4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4716a4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4716a4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.glsl
index 3b932a2..2cd75f9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/475c10.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_475c10();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_475c10();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
index 43264cd..4bc4483 100644
--- a/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/49a067.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_49a067();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_49a067();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.glsl
index 0080ab8..7ee7218 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/4be71b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4be71b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4be71b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.glsl
index 16d847a..ba0a4df 100644
--- a/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/4d1f71.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_4d1f71();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_4d1f71();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
index fff9dd3..6bb733b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/528c0e.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_528c0e();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_528c0e();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.glsl
index 1bc9641..1f62c41 100644
--- a/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/52cf60.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_52cf60();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_52cf60();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.glsl
index 49b95a8..00fdd65 100644
--- a/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/534ef8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_534ef8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_534ef8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl
index 473f4b6..ee421f9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_5df042();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_5df042();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.glsl
index 1b85c7d..eb4ca11 100644
--- a/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/609d34.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_609d34();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_609d34();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.glsl
index 56dfff1..9bc9b80 100644
--- a/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/62cb5a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_62cb5a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_62cb5a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.glsl
index 4e5748d..2b65648 100644
--- a/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/62e7ae.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_62e7ae();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_62e7ae();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
index c62fdb5..ec9fe7c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/64dc74.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_64dc74();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_64dc74();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.glsl
index 55eaae9..3219138 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6dae40.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6dae40();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6dae40();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.glsl
index f864f2b..a73bf70 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6dbef4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6dbef4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6dbef4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
index 5103aeb..d5cbcca 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6e6c7a.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6e6c7a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_6e6c7a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.glsl
index e8f9fa0..84ca61d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6e72c5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6e72c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_6e72c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
index 96d609a..214641b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/6f1b5d.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_6f1b5d();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_6f1b5d();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.glsl
index c200fde..160b073 100644
--- a/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/709357.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_709357();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_709357();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.glsl
index cb663cc..aa7e4b2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7327fa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7327fa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7327fa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
index 3de4a06..02d731f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/756031.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_756031();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_756031();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.glsl
index 2ffbc87..d504b02 100644
--- a/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/790e57.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_790e57();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_790e57();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.glsl
index 18a1624..acd0640 100644
--- a/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/797c30.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_797c30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_797c30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
index 1692f51..db807ef 100644
--- a/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/79d168.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_79d168();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_79d168();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.glsl
index e97f274..8bd3e16 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7a3890.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7a3890();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7a3890();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.glsl
index 5fa987c..660ae16 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7a9e30.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7a9e30();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7a9e30();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.glsl
index 4b4da52..97f6cbd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7c753b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7c753b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7c753b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.glsl
index a0505fe..e543cc7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7d8439.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7d8439();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7d8439();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.glsl
index f052fca..7ded2bc 100644
--- a/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/7edb05.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_7edb05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_7edb05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.glsl
index 4fb8b53..0e776c7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/8057cb.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8057cb();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8057cb();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.glsl
index 1009211..d628e83 100644
--- a/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/841ebe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_841ebe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_841ebe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.glsl
index 9deb858..c203999 100644
--- a/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/879b73.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_879b73();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_879b73();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.glsl
index 796cae4..3dc9efe 100644
--- a/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/87b42d.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_87b42d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_87b42d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.glsl
index dd3a559..8deb497 100644
--- a/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/881dd4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_881dd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_881dd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.glsl
index 9c0f377..463ceb5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/8af728.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8af728();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8af728();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.glsl
index 9d554d8..251849c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/8e15f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8e15f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8e15f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.glsl
index e672cf0..1c5467b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/8e5de6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_8e5de6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_8e5de6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.glsl
index 0fe0d75..1c7474d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/904b0f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_904b0f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_904b0f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
index b807afd..0bcd4ad 100644
--- a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_920006();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_920006();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl
index 962acd1..b7731d2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_965645();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_965645();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.glsl
index 3abbd13..5bc36a9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/98b2d3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_98b2d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_98b2d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
index c18bc1f..a034e20 100644
--- a/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/991ea9.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_991ea9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_991ea9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.glsl
index 6d4e1b1..a37deaf 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9b10a0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9b10a0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9b10a0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.glsl
index b69d99c..01c788d 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9b223b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9b223b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9b223b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
index a5749f4..b53eb0f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9baf27.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9baf27();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_9baf27();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
index dae2980..b946257 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9c7a00();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_9c7a00();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
index d79570b..eb0716b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9cd4ca.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usamplerCube arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9cd4ca();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_9cd4ca();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.glsl
index 29e0b28..4e4620d0 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9d0bac.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9d0bac();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9d0bac();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.glsl
index 2c723bc..fb14dc9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9d68b8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9d68b8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9d68b8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.glsl
index bce519f..2844c69 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9dc27a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9dc27a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9dc27a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
index 87de179..ab19a2f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9e0794.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9e0794();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_9e0794();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.glsl
index 7d03264..2cf9af5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/9fcc3b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_9fcc3b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_9fcc3b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.glsl
index 415fffd..fda6075 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a1598a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a1598a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a1598a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.glsl
index d342034..4a7255f 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a25d9b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a25d9b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a25d9b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
index b2e018f..9adb6d3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a2ba5e.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isamplerCube arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a2ba5e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_a2ba5e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.glsl
index a69aa77..46f85bd 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a3ea91.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a3ea91();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a3ea91();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
index a225770..21681e7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a48049.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a48049();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_a48049();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.glsl
index e1f3eef..19e6203 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a4cd56.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a4cd56();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a4cd56();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.glsl
index 52049ed..331d072 100644
--- a/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/a65776.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_a65776();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_a65776();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
index 4317647..4470d86 100644
--- a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_aac604();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_aac604();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
index ec2c178..29d6353 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b3ab5e.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b3ab5e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_b3ab5e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
index bf16ab4..5ac7fc8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b46d97();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_b46d97();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.glsl
index 96fb2c0..72a91d5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b56112.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b56112();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b56112();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.glsl
index e467316..62695e3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b5ba03.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b5ba03();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b5ba03();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.glsl
index 705645b..d443a6c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b6bbf4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b6bbf4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b6bbf4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.glsl
index 3ed49a2..24428d1 100644
--- a/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/b9e7ef.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_b9e7ef();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_b9e7ef();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.glsl
index 7f78588..1dd66f2 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/bb95d9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bb95d9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bb95d9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
index 072eeef9..37a463b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/bd94c8.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bd94c8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_bd94c8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.glsl
index a4bd89e..b5f6a58 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/bec716.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bec716();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bec716();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.glsl
index ef12451..d7a1c15 100644
--- a/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/bf9170.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_bf9170();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_bf9170();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.glsl
index 2ac752a..65f99da 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/c1189e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c1189e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c1189e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.glsl
index 4099515..92ec011 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/c2cdd3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c2cdd3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c2cdd3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.glsl
index c4ef881..4d21b12 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/c5a36e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c5a36e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_c5a36e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
index 5b80af5..0d2a98a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/c871f3.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_c871f3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_c871f3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.glsl
index cb50b64..8b57229 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/cd3033.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cd3033();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_cd3033();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.glsl
index 9da6126..087c000 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/cdc6c9.wgsl.expected.glsl
@@ -253,16 +253,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cdc6c9();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureDimensions_cdc6c9();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.glsl
index 671343c..ff4fbf9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/cedabd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cedabd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_cedabd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
index 3aff357..a1a0a9b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/cf2b50.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_cf2b50();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_cf2b50();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.glsl
index 0d7cf7f..adbaf99 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d0778e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d0778e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d0778e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
index cb12c53..01613b7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d3accd.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d3accd();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_d3accd();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.glsl
index 7f550c6..abcb84e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d44ac3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d44ac3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d44ac3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.glsl
index a9fe1d2..33f4f95 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d44dd1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d44dd1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d44dd1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.glsl
index 60dff6a..386a522 100644
--- a/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/d6f3cf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_d6f3cf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_d6f3cf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.glsl
index bc00c99..ffe693b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/daf0fe.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_daf0fe();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_daf0fe();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.glsl
index b67f686..b5e538a 100644
--- a/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/db7131.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_db7131();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_db7131();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.glsl
index 0f7b541..2a6606e 100644
--- a/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/de03c6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_de03c6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_de03c6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
index d67dd3e..4f052c5 100644
--- a/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/dfdc32.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_dfdc32();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_dfdc32();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
index 8e7bb4e..5dab635 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e18a8b.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e18a8b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_e18a8b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.glsl
index b9ba19c..bed37e8 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e4bfd2.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e4bfd2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_e4bfd2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
index 2b8effc..15732d3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e4e310.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e4e310();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_e4e310();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
index ea0ab77..6041236 100644
--- a/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/e5a203.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_e5a203();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec3(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_e5a203();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
index 4396295..969e84b 100644
--- a/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/eafe19.wgsl.expected.glsl
@@ -71,7 +71,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -82,16 +82,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_eafe19();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureDimensions_eafe19();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
index 5521571..6e6d3c3 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f17acd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0u);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_f17acd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.glsl
index fc23659..19a3bb7 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f4321c.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec3(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f4321c();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec3(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f4321c();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.glsl
index d4898e9..e467a81 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f48886.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f48886();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f48886();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.glsl
index 07e88c4..2f9de29 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f626b3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f626b3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f626b3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.glsl
index 5a55770..24347c9 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f7bac5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f7bac5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f7bac5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.glsl
index 2e27331..34280da 100644
--- a/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/f8522e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_f8522e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), uvec2(0u));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_f8522e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.glsl
index d1e7135..d344c22 100644
--- a/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/fdbae8.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_fdbae8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureDimensions_fdbae8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
index e9398aa..f18ce0c 100644
--- a/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureDimensions/fdf6e9.wgsl.expected.glsl
@@ -73,7 +73,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -85,16 +85,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec2(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureDimensions_fdf6e9();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec2(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureDimensions_fdf6e9();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.glsl
index 16447c4..a4b02d8 100644
--- a/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/0166ec.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_0166ec();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_0166ec();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.glsl
index 6824fb7..f3547fc 100644
--- a/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/04fa78.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_04fa78();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_04fa78();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.glsl
index 5bd5d6a..5e130ec 100644
--- a/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/10c554.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_10c554();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_10c554();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.glsl
index 7163ad7..2f8516a 100644
--- a/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/11b2db.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_11b2db();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_11b2db();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.glsl
index 1e1d68e..df5f6cf 100644
--- a/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/17baac.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_17baac();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_17baac();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.glsl
index 4b6644a..487c02b 100644
--- a/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/1bf0ab.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_1bf0ab();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_1bf0ab();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.glsl
index 728301d..fbe3668 100644
--- a/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/1f7f6b.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_1f7f6b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_1f7f6b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.glsl
index c06afd7..1391a6a 100644
--- a/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/22e930.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_22e930();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_22e930();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.glsl
index fc7808c..f50d6d3 100644
--- a/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/238ec4.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_238ec4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_238ec4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.glsl
index 8762e77..71cc1d7 100644
--- a/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/24b0bd.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_24b0bd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_24b0bd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.glsl
index aa15b00..6c1da27 100644
--- a/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/269250.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_269250();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_269250();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.glsl
index d9237a6..26990b6 100644
--- a/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/2a4f40.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2a4f40();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_2a4f40();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.glsl
index 39a7db8..f7eaa8e 100644
--- a/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/2cc066.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2cc066();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_2cc066();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.glsl
index 36cadd0..6aa6c33 100644
--- a/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/2e0ed5.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_2e0ed5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGather_2e0ed5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.glsl
index 3a418fd..1d569a8 100644
--- a/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/32c4e8.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_32c4e8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_32c4e8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.glsl
index 940ca79..755f300 100644
--- a/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/3b32cc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_3b32cc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_3b32cc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.glsl
index 6d99b7f..729e7a9 100644
--- a/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/43025d.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_43025d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_43025d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.glsl
index 97bf638..45317a0 100644
--- a/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/445793.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_445793();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_445793();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.glsl
index f779c2b..c4b52a4 100644
--- a/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/49b07f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_49b07f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_49b07f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.glsl
index 8524141..1dae6d1 100644
--- a/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/4b8103.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_4b8103();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_4b8103();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.glsl
index e8344d6..1bbe906 100644
--- a/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/4e8ac5.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_4e8ac5();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_4e8ac5();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.glsl
index 823f413..516e6f7 100644
--- a/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/5266da.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5266da();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_5266da();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.glsl
index e03b7da..0d49003 100644
--- a/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/59372a.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_59372a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_59372a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.glsl
index 0a22dfe..91a04e7 100644
--- a/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/5ba85f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5ba85f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_5ba85f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.glsl
index 173e839..f5e4b86 100644
--- a/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/5bd491.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_5bd491();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_5bd491();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.glsl
index f5323ac..c0b47ec 100644
--- a/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/6b7b74.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_6b7b74();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_6b7b74();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.glsl
index 7f599ed..b621f52 100644
--- a/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/751f8a.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_751f8a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_751f8a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.glsl
index 19cf55a..af53bf2 100644
--- a/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/788010.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_788010();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_788010();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.glsl
index 72bc8f3..521c4e0 100644
--- a/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/7c3828.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_7c3828();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_7c3828();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.glsl
index 7b33ab1..b59f075e 100644
--- a/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/7dd226.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_7dd226();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_7dd226();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.glsl
index a04c6e2..64a3817 100644
--- a/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/829357.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_829357();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_829357();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.glsl
index a7f728e..c56ac88 100644
--- a/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/831549.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_831549();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_831549();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.glsl
index a13bac2..eefdd43 100644
--- a/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/8578bc.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8578bc();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_8578bc();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.glsl
index b0c6ad9..dd9e0a5 100644
--- a/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/89680f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_89680f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_89680f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.glsl
index 1f62c4a..bfcc0e3 100644
--- a/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/8b754c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8b754c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_8b754c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.glsl
index f1deee2..de7aa6a 100644
--- a/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/8fae00.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_8fae00();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_8fae00();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.glsl
index 4e1e483..03a98b1 100644
--- a/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/92ea47.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_92ea47();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_92ea47();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.glsl
index 5a40639..cca1bea 100644
--- a/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/986700.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_986700();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_986700();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.glsl
index ad0b0b1..e3c8361 100644
--- a/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/9a6358.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_9a6358();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_9a6358();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.glsl
index 40bb18c..481a65e 100644
--- a/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/9ab41e.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_9ab41e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_9ab41e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.glsl
index 3b476c0..df154c6 100644
--- a/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/a0372b.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_a0372b();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_a0372b();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.glsl
index 17d9ed2..d99a284 100644
--- a/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/a68027.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_a68027();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_a68027();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.glsl
index 1a04f5b..fac9428 100644
--- a/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/aaf6bd.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_aaf6bd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_aaf6bd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.glsl
index 548c9f5..33a595e 100644
--- a/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/af55b3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_af55b3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_af55b3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.glsl
index 5327754..7af3995 100644
--- a/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/bb3ac5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_bb3ac5();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_bb3ac5();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.glsl
index 08870f8..167ebc4 100644
--- a/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/bd33b6.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_bd33b6();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_bd33b6();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.glsl
index f38a8e4..e5d2718 100644
--- a/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/be276f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_be276f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_be276f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.glsl
index 5fb219b..351bf9b 100644
--- a/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/c0640c.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_c0640c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_c0640c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.glsl
index 91a6cda..55bbd8e 100644
--- a/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/ccadde.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ccadde();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_ccadde();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.glsl
index 01f1c53..1e7359c 100644
--- a/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/ce5578.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ce5578();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_ce5578();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.glsl
index bdfcf8e..c66fd2e 100644
--- a/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/cf9112.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_cf9112();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_cf9112();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.glsl
index eba6721..0238d5f 100644
--- a/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d1f187.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d1f187();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_d1f187();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.glsl
index 72b0208..02083be 100644
--- a/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d4b5c6.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d4b5c6();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_d4b5c6();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.glsl
index 0896ff4..1b21d08 100644
--- a/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d6507c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d6507c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d6507c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.glsl
index 11bdfe1..fc4a3be 100644
--- a/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d8e958.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d8e958();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d8e958();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.glsl
index 80c1bbe..c94264a 100644
--- a/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d90605.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d90605();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_d90605();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.glsl
index 05c6730..3ecec11 100644
--- a/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/d98d59.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_d98d59();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_d98d59();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.glsl
index 0bc1307..6cb64f8 100644
--- a/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/dc6661.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_dc6661();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureGather_dc6661();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.glsl
index e9d693e..d904f78 100644
--- a/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/e2acac.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e2acac();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_e2acac();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.glsl
index f1f48ba..6ba6295 100644
--- a/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/e3165f.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e3165f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_e3165f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.glsl
index 57f974e..9523884 100644
--- a/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/e9d390.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_e9d390();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_e9d390();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.glsl
index b2217d9..47be52f 100644
--- a/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/ea8eb4.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_ea8eb4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_ea8eb4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.glsl
index d58bf68..d77c6ee 100644
--- a/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGather/f2c6e3.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGather_f2c6e3();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGather_f2c6e3();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.glsl
index e9f101c..b59cef3 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/144a9a.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_144a9a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_144a9a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.glsl
index 2f3a983..4763a59 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/182fd4.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_182fd4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_182fd4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.glsl
index a37f939..0297fdd 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/2e409c.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_2e409c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_2e409c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.glsl
index 8c811e2..d433c4f 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/313add.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_313add();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_313add();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.glsl
index d4cf9bf..9e4c3ea 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/60d2d1.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_60d2d1();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_60d2d1();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.glsl
index cf28783..a987956 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/6d9352.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_6d9352();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureGatherCompare_6d9352();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.glsl
index 36a4b5e..979f550 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/783e65.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_783e65();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_783e65();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.glsl
index b14d5d5..2592413 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/b5bc43.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_b5bc43();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_b5bc43();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.glsl
index e9ec44d..bf14b54 100644
--- a/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureGatherCompare/f585cc.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureGatherCompare_f585cc();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureGatherCompare_f585cc();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
index e06eb91..b084f18 100644
--- a/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/019da0.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_019da0();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_019da0();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
index 981e268..c093101 100644
--- a/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/026217.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_026217();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_026217();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.glsl
index 7b8bcab..dde2b2c 100644
--- a/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/045ec9.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_045ec9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_045ec9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
index 3d4ed13..f6ec4b6 100644
--- a/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/04b911.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_04b911();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), 0.0f);
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_04b911();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.glsl
index 7b80256..5887544 100644
--- a/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/050c33.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_050c33();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_050c33();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.glsl
index 7eb3223..7a632e3 100644
--- a/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/0674b1.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_0674b1();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_0674b1();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.glsl
index 68a7e2a..99e057e 100644
--- a/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/06ac37.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_06ac37();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_06ac37();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.glsl
index 6c3744c..3b11772 100644
--- a/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/072e26.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_072e26();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_072e26();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.glsl
index 5aee99b..739ce09 100644
--- a/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/078bc4.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_078bc4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_078bc4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
index 0a20149..224c48c 100644
--- a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_0cb698();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_0cb698();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.glsl
index 1cc4d10..f587deb 100644
--- a/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/10db82.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_10db82();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_10db82();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.glsl
index 190f4ea..3e6728d 100644
--- a/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/127e12.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_127e12();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_127e12();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
index 71f5bbe..6865148 100644
--- a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1373dc();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_1373dc();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.glsl
index 182beae..4b69c9e 100644
--- a/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/13d539.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_13d539();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_13d539();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.glsl
index c067b01..c16992b 100644
--- a/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/13e90c.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_13e90c();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_13e90c();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.glsl
index 65214f3..26e3ddb 100644
--- a/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/143d84.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_143d84();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_143d84();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.glsl
index bbd5a6c..f75c120 100644
--- a/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1471b8.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1471b8();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_1471b8();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.glsl
index 794d251..d8a145d 100644
--- a/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1561a7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1561a7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_1561a7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.glsl
index 57ce98e..47fa1fc 100644
--- a/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/15e675.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_15e675();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_15e675();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
index 36a9243..1df5301 100644
--- a/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/168dc8.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_168dc8();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_168dc8();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.glsl
index 3f312e7..6f25df0 100644
--- a/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/18ac11.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_18ac11();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_18ac11();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
index 2b25e2f..1a2f7eb 100644
--- a/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/19cf87.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_19cf87();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), 0.0f);
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_19cf87();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.glsl
index a5536cd..3f9488f 100644
--- a/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/19e5ca.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_19e5ca();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_19e5ca();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.glsl
index f433879..f8c0fff 100644
--- a/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1a062f.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1a062f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_1a062f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.glsl
index 00c6727..521ad2c 100644
--- a/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1a8452.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1a8452();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_1a8452();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.glsl
index 3b7a1ce1..0157ef4 100644
--- a/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1aa950.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1aa950();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_1aa950();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
index 70b81de..357ba7c 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1b051f.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1b051f();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_1b051f();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
index dad9b20..11bcc91 100644
--- a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1b8588();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_1b8588();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.glsl
index 622be8e..1513139 100644
--- a/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1bfdfb.wgsl.expected.glsl
@@ -349,16 +349,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1bfdfb();
-  return tint_symbol;
+  VertexOutput v_17 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_17.pos = vec4(0.0f);
+  v_17.prevent_dce = textureLoad_1bfdfb();
+  return v_17;
 }
 void main() {
-  VertexOutput v_17 = vertex_main_inner();
-  gl_Position = v_17.pos;
+  VertexOutput v_18 = vertex_main_inner();
+  gl_Position = v_18.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_17.prevent_dce;
+  tint_interstage_location0 = v_18.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
index 46f83b1..dc46308 100644
--- a/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1c562a.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1c562a();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_1c562a();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.glsl
index 1703ce1..71243a2 100644
--- a/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1eb93f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1eb93f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_1eb93f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
index 87e12ae..0384deb 100644
--- a/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/1f2016.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_1f2016();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_1f2016();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.glsl
index 94247ef..3c8ae2a 100644
--- a/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/206a08.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_206a08();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_206a08();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.glsl
index 2bfbde4..43fc52f 100644
--- a/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/20fa2f.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_20fa2f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_20fa2f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
index b6a0126..7871e7e 100644
--- a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_216c37();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_216c37();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
index 66db50c..07c75d4 100644
--- a/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/21d1c4.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_21d1c4();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_21d1c4();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
index 805d01f..63aeb40 100644
--- a/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/223246.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_223246();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_223246();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.glsl
index e62e378..f908b50 100644
--- a/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/22e963.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_22e963();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_22e963();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.glsl
index 4efe1f3..9980a08 100644
--- a/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/23007a.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_23007a();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_23007a();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
index a0ec757..5c3c54c 100644
--- a/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2363be.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2363be();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_2363be();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.glsl
index e47fe13..75a5b3d 100644
--- a/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/23ff89.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_23ff89();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_23ff89();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.glsl
index ec00ce5..9fee98c 100644
--- a/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/26c4f8.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_26c4f8();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_26c4f8();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.glsl
index 39a1767..1f62978 100644
--- a/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/26d7f1.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_26d7f1();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_26d7f1();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.glsl
index 3811ee3..cb920b1 100644
--- a/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/276643.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_276643();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_276643();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.glsl
index 8b035ed..1a1c6c7 100644
--- a/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/276a2c.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_276a2c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_276a2c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.glsl
index e67a28d..a9e70ac 100644
--- a/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2887d7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2887d7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_2887d7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.glsl
index b1d2109..33a79cf 100644
--- a/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2a82d9.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2a82d9();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_2a82d9();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.glsl
index 8febb0b..67de5f2 100644
--- a/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2ae485.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2ae485();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_2ae485();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.glsl
index de8d76a8..5120be7 100644
--- a/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2c72ae.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2c72ae();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_2c72ae();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
index 0f2ae33..c0f04ca 100644
--- a/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2d479c.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2d479c();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_2d479c();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.glsl
index aae2804..369deba 100644
--- a/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2d6cf7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2d6cf7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_2d6cf7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.glsl
index 9cc6310..49bf68b 100644
--- a/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2e09aa.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2e09aa();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_2e09aa();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.glsl
index 849c9f1..9f94fe9 100644
--- a/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/2e3552.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_2e3552();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_2e3552();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.glsl
index 09d3220..cd26a56 100644
--- a/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/313c73.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_313c73();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_313c73();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.glsl
index f333003..0fca20a 100644
--- a/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/31db4b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_31db4b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_31db4b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.glsl
index f7bd7ac..7ef4580 100644
--- a/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/321210.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_321210();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_321210();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.glsl
index 52455df..7ebe889 100644
--- a/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/33d3aa.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_33d3aa();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_33d3aa();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.glsl
index 444e35b..56e8126 100644
--- a/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/348827.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_348827();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_348827();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.glsl
index 450223b..9fe11e0 100644
--- a/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/35d464.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_35d464();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_35d464();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.glsl
index 492041d..b5af91d 100644
--- a/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/374351.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_374351();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_374351();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.glsl
index 373e701..7a31081 100644
--- a/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/388688.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_388688();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_388688();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.glsl
index 86249c1..d20d02d 100644
--- a/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/38f8ab.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_38f8ab();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_38f8ab();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.glsl
index 7575a81..eabe565 100644
--- a/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/39ef40.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_39ef40();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_39ef40();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.glsl
index a4c7ee6..eccbc05 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3c0d9e.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c0d9e();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_3c0d9e();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.glsl
index 3bfe6f8..503c110 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3c9587.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c9587();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_3c9587();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
index 9c58c5b..1413614 100644
--- a/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3c96e8.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3c96e8();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_3c96e8();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.glsl
index 98d219a..4a0141c 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3d001b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d001b();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_3d001b();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
index 1c75f80..165e21a 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3d3fd1.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d3fd1();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_3d3fd1();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.glsl
index 515dc4b..af6f0f7 100644
--- a/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3d9c90.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3d9c90();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_3d9c90();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
index 47eca76..f78b580 100644
--- a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3da3ed();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_3da3ed();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.glsl
index 6997705..9e370b4 100644
--- a/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/3e5f6a.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_3e5f6a();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_3e5f6a();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
index 8656597..dbcab78 100644
--- a/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/439e2a.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_439e2a();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_439e2a();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.glsl
index 114e395..8291c9a 100644
--- a/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/44c826.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_44c826();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_44c826();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.glsl
index 802c637..8ddc7f1 100644
--- a/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/454347.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_454347();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_454347();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.glsl
index dde6eb3..6b7a966 100644
--- a/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4638a0.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4638a0();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_4638a0();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
index 5d96c0b..678d34e 100644
--- a/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/46a93f.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_46a93f();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_46a93f();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.glsl
index 9dfab0d..444c7dc 100644
--- a/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/46dbf5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_46dbf5();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_46dbf5();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
index 8edc724..b2b57a3 100644
--- a/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/47e818.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_47e818();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_47e818();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
index 86f22ee..cb6a4e1 100644
--- a/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/484344.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_484344();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_484344();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.glsl
index 92bde0e..d9d6d7a 100644
--- a/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4951bb.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4951bb();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_4951bb();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.glsl
index 3daec83..1430ef7 100644
--- a/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/49f76f.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_49f76f();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_49f76f();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
index d696260..3c512e5 100644
--- a/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4acb64.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4acb64();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_4acb64();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
index b3a9ea8..91a237d 100644
--- a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4c423f();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_4c423f();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.glsl
index 357e261..ed0cee2 100644
--- a/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4c67be.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4c67be();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_4c67be();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.glsl
index fca5ca3..dbd0b90 100644
--- a/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4cdca5.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4cdca5();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_4cdca5();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.glsl
index 2ef7eb9..4256ca2 100644
--- a/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4db25c.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4db25c();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_4db25c();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.glsl
index bfaae08..01faca3 100644
--- a/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4fa6ae.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4fa6ae();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_4fa6ae();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
index a4a9a07..b9c9a25 100644
--- a/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/4fd803.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_4fd803();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_4fd803();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.glsl
index c19bbcc..7b406d9 100644
--- a/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/505aa2.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_505aa2();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_505aa2();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.glsl
index 3a99eba..6df2c3c 100644
--- a/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/50915c.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_50915c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_50915c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.glsl
index 1305cd4..ee22309 100644
--- a/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/519ab5.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_519ab5();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_519ab5();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.glsl
index 1ad05e2..adb96a6 100644
--- a/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/53378a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_53378a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_53378a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
index 3fa720c..61265cb 100644
--- a/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/53e142.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_53e142();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_53e142();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
index 9001100..4c8a124 100644
--- a/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/54a59b.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_54a59b();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_54a59b();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.glsl
index 915e579..1411138 100644
--- a/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/54e0ce.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_54e0ce();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_54e0ce();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.glsl
index eca78c1..5d2198c 100644
--- a/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/55e745.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_55e745();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_55e745();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.glsl
index af6fbef..1ca006e 100644
--- a/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/560573.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_560573();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_560573();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.glsl
index fe0e3cf..dbf87ef 100644
--- a/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/582015.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_582015();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_582015();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.glsl
index 072d174..b89f77b 100644
--- a/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/589eaa.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_589eaa();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_589eaa();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
index 4029aae..dc06445 100644
--- a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5a2f9d();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_5a2f9d();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.glsl
index 62a2e33..fca6f1e 100644
--- a/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5abbf2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5abbf2();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5abbf2();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.glsl
index d89128a..6a18231 100644
--- a/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5bb7fb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5bb7fb();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_5bb7fb();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.glsl
index bb39cff..c911cf3 100644
--- a/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5cee3b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5cee3b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5cee3b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.glsl
index 423c3f7..3244728 100644
--- a/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5d0a2f.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5d0a2f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_5d0a2f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.glsl
index a8e9821..5cc792b 100644
--- a/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5d4042.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5d4042();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_5d4042();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.glsl
index 19920af..2431b5d 100644
--- a/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5dd4c7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5dd4c7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_5dd4c7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.glsl
index 34e73ef..80c28ef 100644
--- a/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5e8d3f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5e8d3f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5e8d3f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.glsl
index 39e6824..400daa4 100644
--- a/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5ed6ad.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5ed6ad();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_5ed6ad();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.glsl
index 44ebf94..474b0b3 100644
--- a/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5f4473.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5f4473();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5f4473();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.glsl
index 21315a2..1358a10 100644
--- a/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/5feb4d.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_5feb4d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_5feb4d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
index 727f6eb..ffd5f7a 100644
--- a/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6154d4.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6154d4();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_6154d4();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.glsl
index 0601ca5..f0f3dcf 100644
--- a/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/620caa.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_620caa();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_620caa();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.glsl
index 99734ae..e9a5524 100644
--- a/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6273b1.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6273b1();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0.0f);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6273b1();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.glsl
index dbc87c8..0c69610 100644
--- a/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/62d125.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_62d125();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_62d125();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
index 92fe39e..d26b8aa 100644
--- a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_62d1de();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_62d1de();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.glsl
index 3de246c..4561f38 100644
--- a/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/639962.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_639962();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_639962();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.glsl
index 1ccbd86..925228f 100644
--- a/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/63be18.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_63be18();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_63be18();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
index 0459694..c0513d3 100644
--- a/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/656d76.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_656d76();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_656d76();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.glsl
index 6f30467..82a0a17 100644
--- a/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/65a4d0.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_65a4d0();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_65a4d0();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.glsl
index e5ffc14..76235ec 100644
--- a/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6678b6.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6678b6();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_6678b6();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
index c99d52b7..9ecef14 100644
--- a/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/66be47.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_66be47();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), 0.0f);
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_66be47();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.glsl
index 133ac41..91dad4e 100644
--- a/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/67edca.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_67edca();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_67edca();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.glsl
index 539b9e4..ccb370c 100644
--- a/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6925bc.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6925bc();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0.0f);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6925bc();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
index 289b316..064c47a 100644
--- a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6b77d4();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_6b77d4();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
index b1e2051..c2c144c 100644
--- a/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6bf4b7.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6bf4b7();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_6bf4b7();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
index 75f75fe..91a24bf 100644
--- a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6d376a();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6d376a();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.glsl
index 35d3669..71afc15 100644
--- a/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6f0370.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6f0370();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_6f0370();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.glsl
index bbde3f8..dfbc814 100644
--- a/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/6f1750.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_6f1750();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_6f1750();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
index 8f93fdd..0f67e0d 100644
--- a/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/714471.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_714471();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_714471();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.glsl
index 5dc8ae9..f2bb784 100644
--- a/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/72bb3c.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_72bb3c();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_72bb3c();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.glsl
index 5cfe09d..3847b15 100644
--- a/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/749704.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_749704();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_749704();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.glsl
index 54d8ba1..4ac9c7e 100644
--- a/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/773c46.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_773c46();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_773c46();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
index 2d1c75b..5a04119 100644
--- a/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/789045.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_789045();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_789045();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
index 151e57d..a2ac168 100644
--- a/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/79e697.wgsl.expected.glsl
@@ -95,7 +95,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -118,16 +118,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_79e697();
-  return tint_symbol;
+  VertexOutput v_11 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_11.pos = vec4(0.0f);
+  v_11.prevent_dce = textureLoad_79e697();
+  return v_11;
 }
 void main() {
-  VertexOutput v_11 = vertex_main_inner();
-  gl_Position = v_11.pos;
+  VertexOutput v_12 = vertex_main_inner();
+  gl_Position = v_12.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_11.prevent_dce;
+  tint_interstage_location0 = v_12.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
index 4dba80a..424d3c4 100644
--- a/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7ab4df.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7ab4df();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_7ab4df();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
index aac03f2..d2e9a5c 100644
--- a/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7b63e0.wgsl.expected.glsl
@@ -89,7 +89,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -109,16 +109,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7b63e0();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), 0.0f);
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_7b63e0();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.glsl
index 1104106..0721f64 100644
--- a/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7bee94.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7bee94();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_7bee94();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
index 619d45d..3c6a319 100644
--- a/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7c90e5.wgsl.expected.glsl
@@ -95,7 +95,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -118,16 +118,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7c90e5();
-  return tint_symbol;
+  VertexOutput v_11 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_11.pos = vec4(0.0f);
+  v_11.prevent_dce = textureLoad_7c90e5();
+  return v_11;
 }
 void main() {
-  VertexOutput v_11 = vertex_main_inner();
-  gl_Position = v_11.pos;
+  VertexOutput v_12 = vertex_main_inner();
+  gl_Position = v_12.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_11.prevent_dce;
+  tint_interstage_location0 = v_12.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.glsl
index 07b8ea7..8821f9a 100644
--- a/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7dab57.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7dab57();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_7dab57();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
index 32c15a2..e1f77b8 100644
--- a/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/7fd822.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_7fd822();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0.0f);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_7fd822();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
index b9ad3d2..e936baa 100644
--- a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_81c381();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_81c381();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.glsl
index 5b7e534..dd0ed54 100644
--- a/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/83162f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_83162f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_83162f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.glsl
index eefc078..80a9315 100644
--- a/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/83cea4.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_83cea4();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_83cea4();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.glsl
index c2498db..bc200bf 100644
--- a/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/84c728.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_84c728();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_84c728();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
index dd10394..ec81b6f 100644
--- a/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/84dee1.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_84dee1();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_84dee1();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
index 29a272c..df10e56 100644
--- a/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8527b1.wgsl.expected.glsl
@@ -89,7 +89,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -109,16 +109,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8527b1();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_8527b1();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.glsl
index 502bb31..576679a 100644
--- a/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/862833.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_862833();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_862833();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
index 9cef3aa..d559c25 100644
--- a/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/87be85.wgsl.expected.glsl
@@ -95,7 +95,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -118,16 +118,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_87be85();
-  return tint_symbol;
+  VertexOutput v_11 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_11.pos = vec4(0.0f);
+  v_11.prevent_dce = textureLoad_87be85();
+  return v_11;
 }
 void main() {
-  VertexOutput v_11 = vertex_main_inner();
-  gl_Position = v_11.pos;
+  VertexOutput v_12 = vertex_main_inner();
+  gl_Position = v_12.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_11.prevent_dce;
+  tint_interstage_location0 = v_12.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.glsl
index 0b193f9..2167463 100644
--- a/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/89620b.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_89620b();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_89620b();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
index 9ad3c95..c879c37 100644
--- a/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/897cf3.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_897cf3();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_897cf3();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.glsl
index 1ea5d4e..004b5f2 100644
--- a/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8a291b.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8a291b();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_8a291b();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.glsl
index 6e79491..3ca24e6 100644
--- a/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8a9988.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8a9988();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_8a9988();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.glsl
index 0335aee..b1b64a3 100644
--- a/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8acf41.wgsl.expected.glsl
@@ -349,16 +349,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8acf41();
-  return tint_symbol;
+  VertexOutput v_17 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_17.pos = vec4(0.0f);
+  v_17.prevent_dce = textureLoad_8acf41();
+  return v_17;
 }
 void main() {
-  VertexOutput v_17 = vertex_main_inner();
-  gl_Position = v_17.pos;
+  VertexOutput v_18 = vertex_main_inner();
+  gl_Position = v_18.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_17.prevent_dce;
+  tint_interstage_location0 = v_18.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
index e079494..c1764ff 100644
--- a/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8ccbe3.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8ccbe3();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), 0.0f);
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_8ccbe3();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.glsl
index bd5ed23..c762581 100644
--- a/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8db0ce.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8db0ce();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_8db0ce();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.glsl
index 37cd7a6..2e85dee 100644
--- a/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8e5032.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8e5032();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_8e5032();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.glsl
index 1f46125..3b6b94a 100644
--- a/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/8ff033.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_8ff033();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_8ff033();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
index 3c639cd..6109f1f 100644
--- a/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/92eb1f.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_92eb1f();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_92eb1f();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.glsl
index 93f4a64..8fae754 100644
--- a/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/936952.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_936952();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_936952();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.glsl
index f55ba44..e93fd0a 100644
--- a/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/947107.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_947107();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_947107();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
index ab647f0..d649c93 100644
--- a/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/96efd5.wgsl.expected.glsl
@@ -89,7 +89,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -109,16 +109,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_96efd5();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_96efd5();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.glsl
index 39dca9e..7b60c02 100644
--- a/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/970308.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_970308();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_970308();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
index 89260e7..c44e31b 100644
--- a/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9885b0.wgsl.expected.glsl
@@ -89,7 +89,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -109,16 +109,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9885b0();
-  return tint_symbol;
+  VertexOutput v_8 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_8.pos = vec4(0.0f);
+  v_8.prevent_dce = textureLoad_9885b0();
+  return v_8;
 }
 void main() {
-  VertexOutput v_8 = vertex_main_inner();
-  gl_Position = v_8.pos;
+  VertexOutput v_9 = vertex_main_inner();
+  gl_Position = v_9.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_8.prevent_dce;
+  tint_interstage_location0 = v_9.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.glsl
index c562976..b17b5e3 100644
--- a/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9a7c90.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9a7c90();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_9a7c90();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.glsl
index 0d7bd952..47df39b 100644
--- a/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9a8c1e.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9a8c1e();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9a8c1e();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
index 20b7b12..efd6bd8 100644
--- a/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9aa733.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9aa733();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9aa733();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
index ac2ecf6..206282d 100644
--- a/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9b2667.wgsl.expected.glsl
@@ -95,7 +95,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -118,16 +118,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9b2667();
-  return tint_symbol;
+  VertexOutput v_11 = VertexOutput(vec4(0.0f), 0.0f);
+  v_11.pos = vec4(0.0f);
+  v_11.prevent_dce = textureLoad_9b2667();
+  return v_11;
 }
 void main() {
-  VertexOutput v_11 = vertex_main_inner();
-  gl_Position = v_11.pos;
+  VertexOutput v_12 = vertex_main_inner();
+  gl_Position = v_12.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_11.prevent_dce;
+  tint_interstage_location0 = v_12.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.glsl
index d7cebaf..3bb5760 100644
--- a/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9b5343.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9b5343();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9b5343();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.glsl
index c240d45..07e3e40 100644
--- a/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9c2376.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9c2376();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9c2376();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.glsl
index 8d44dd4..34482ef 100644
--- a/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9c2a14.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9c2a14();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_9c2a14();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.glsl
index b00507e..500c4ec 100644
--- a/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9cf7df.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9cf7df();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9cf7df();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
index cdf6edc..2056f41 100644
--- a/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9d70e9.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9d70e9();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_9d70e9();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.glsl
index 161b517..bf6a2d8 100644
--- a/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9de6f5.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9de6f5();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_9de6f5();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
index c4614a9..c7658cb 100644
--- a/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9ed19e.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9ed19e();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), 0.0f);
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_9ed19e();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
index 2860dbd..48644cb 100644
--- a/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/9fbfd9.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_9fbfd9();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_9fbfd9();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.glsl
index 796ee70..ba22c90 100644
--- a/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a03af1.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a03af1();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_a03af1();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
index edb5add..43d3333 100644
--- a/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a24be1.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a24be1();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_a24be1();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.glsl
index 2193fd1..92e2a57 100644
--- a/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a583c9.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a583c9();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_a583c9();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.glsl
index b836277..690f9db 100644
--- a/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a6a85a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a6a85a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_a6a85a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.glsl
index 6d1d27a..2b3f6ab 100644
--- a/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a6b61d.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a6b61d();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_a6b61d();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.glsl
index 462fdf1..e5737c7 100644
--- a/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a7444c.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a7444c();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_a7444c();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.glsl
index 45dd106..3fcf238 100644
--- a/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a7a3c3.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a7a3c3();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_a7a3c3();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.glsl
index f596f1a..56dfd26 100644
--- a/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a8549b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a8549b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_a8549b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
index 1017f20..420ce33 100644
--- a/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/a9a9f5.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler3D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_a9a9f5();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_a9a9f5();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.glsl
index 45b509f..b6381a0 100644
--- a/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/aa8a0d.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aa8a0d();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_aa8a0d();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.glsl
index 4da9684..30273ff 100644
--- a/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/aae7f6.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aae7f6();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_aae7f6();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.glsl
index a447f98..b54ce42 100644
--- a/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ac64f7.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ac64f7();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_ac64f7();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.glsl
index 1b79e87..c550a38 100644
--- a/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/aeae73.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aeae73();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_aeae73();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.glsl
index c3420b4..787f6a9 100644
--- a/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/aebc09.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_aebc09();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_aebc09();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.glsl
index 1457987..03b9e93 100644
--- a/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b1bf79.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b1bf79();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_b1bf79();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.glsl
index 03fe6f0..63e9cfe 100644
--- a/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b24d27.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b24d27();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_b24d27();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
index ae96c38..3bf84ed 100644
--- a/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b29f71.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b29f71();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_b29f71();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.glsl
index 6079dfa..de09808 100644
--- a/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b58c6d.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b58c6d();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_b58c6d();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
index 9f2e1c8..2b27699 100644
--- a/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b6ba5d.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b6ba5d();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), 0.0f);
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_b6ba5d();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.glsl
index 228c875..86098f6 100644
--- a/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b6c458.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b6c458();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_b6c458();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
index 07ff19a..51cec3f 100644
--- a/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b73f6b.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b73f6b();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_b73f6b();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.glsl
index 0215b93..9959037 100644
--- a/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b75d4a.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b75d4a();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_b75d4a();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.glsl
index 0b68633..a9b942b 100644
--- a/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b7f74f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b7f74f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_b7f74f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.glsl
index 32ced4b..5cc30e6 100644
--- a/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b80e7e.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b80e7e();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_b80e7e();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.glsl
index 881812b..7b3f18d 100644
--- a/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/b94d15.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_b94d15();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_b94d15();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
index 4435e5f..83728d2 100644
--- a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl
@@ -79,7 +79,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -94,16 +94,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bc3201();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_bc3201();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
index 3aa8f4e..0242381 100644
--- a/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/bcbb3c.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bcbb3c();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_bcbb3c();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.glsl
index 099a5d5..42d42f4 100644
--- a/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/bfd154.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_bfd154();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_bfd154();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.glsl
index 5845c75..f01a0342 100644
--- a/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c02b74.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c02b74();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c02b74();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.glsl
index 2ac03f5..383cbb8 100644
--- a/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c07013.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c07013();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c07013();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
index a2ebb95..c39de2a 100644
--- a/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c16e00.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c16e00();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), 0.0f);
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_c16e00();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.glsl
index 3395859..e5aa699 100644
--- a/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c21b33.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c21b33();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_c21b33();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
index 62d324c..d29bf1c 100644
--- a/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c2a480.wgsl.expected.glsl
@@ -83,7 +83,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -100,16 +100,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c2a480();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_c2a480();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.glsl
index 2a4136d..2cd5a9b 100644
--- a/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c378ee.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c378ee();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_c378ee();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.glsl
index 0cc3c7d..07ddf50 100644
--- a/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c40dcb.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c40dcb();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_c40dcb();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.glsl
index ce15bd4..b547897 100644
--- a/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c456bc.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c456bc();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c456bc();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.glsl
index 92e6b61..f21f70e 100644
--- a/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c5791b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c5791b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c5791b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.glsl
index f1f8a0b..7aac8e2 100644
--- a/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c66b20.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c66b20();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_c66b20();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.glsl
index b5fb4e7..17bb255 100644
--- a/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c7cbed.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c7cbed();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c7cbed();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.glsl
index bafc1df..ab65d60 100644
--- a/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c8ed19.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c8ed19();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_c8ed19();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.glsl
index a12c317..b8a3d70 100644
--- a/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/c9cc40.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_c9cc40();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_c9cc40();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.glsl
index 756e3fb..d274e70 100644
--- a/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/cad5f2.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cad5f2();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_cad5f2();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
index 9afeb88..681c9eb 100644
--- a/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/cb57c2.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cb57c2();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), 0.0f);
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_cb57c2();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.glsl
index b90743f..d85afc5 100644
--- a/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/cdd343.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cdd343();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_cdd343();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.glsl
index bda900a..ef0f9d9 100644
--- a/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/cece6c.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_cece6c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_cece6c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.glsl
index 59227ab..4bfbcd7 100644
--- a/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d02afc.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d02afc();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d02afc();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.glsl
index e41147a..c6dcc6c 100644
--- a/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d357bb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d357bb();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_d357bb();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.glsl
index bc3f1c0..57dfe74 100644
--- a/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d4df19.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d4df19();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d4df19();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.glsl
index 248f50a..ab03f38 100644
--- a/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d5c48d.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d5c48d();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_d5c48d();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.glsl
index 9ad5c7c..b4c6ed4 100644
--- a/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d81c57.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d81c57();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_d81c57();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.glsl
index ef1a0d7..7d9ced3 100644
--- a/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d85d61.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d85d61();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_d85d61();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.glsl
index 235e45b..c68a87d 100644
--- a/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/d8617f.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_d8617f();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_d8617f();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.glsl
index 252d04b..224d64a 100644
--- a/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/dbd554.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dbd554();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_dbd554();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.glsl
index 34ad898..5f4b347 100644
--- a/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/dd8776.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dd8776();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_dd8776();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.glsl
index cfae5fe..9b65828 100644
--- a/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ddeed3.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ddeed3();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_ddeed3();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.glsl
index 4044d03..4363e5f 100644
--- a/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/dee8e7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dee8e7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_dee8e7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.glsl
index f8f8542..c4c1345 100644
--- a/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/dfdf3b.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_dfdf3b();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_dfdf3b();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.glsl
index 6a2c6e1..9fa7ad9 100644
--- a/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e2292f.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e2292f();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e2292f();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
index d4565c1..4e27b2b 100644
--- a/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e35f72.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler3D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e35f72();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_e35f72();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.glsl
index d1b4147..180c291 100644
--- a/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e3b08b.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e3b08b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e3b08b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.glsl
index be75049..0749ca2 100644
--- a/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e3d2cc.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e3d2cc();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_e3d2cc();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.glsl
index 161ed1f..65cb13a 100644
--- a/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e57e92.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e57e92();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_e57e92();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.glsl
index 80fa846..b71db79 100644
--- a/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e59fdf.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e59fdf();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e59fdf();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.glsl
index 7f499c7..096b1ae 100644
--- a/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e65916.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e65916();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_e65916();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.glsl
index 6975702..3208c79 100644
--- a/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e893d7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e893d7();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_e893d7();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.glsl
index 6431bf0..d5b36ae 100644
--- a/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/e92dd0.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_e92dd0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_e92dd0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.glsl
index 9b44a42..2ade3ee 100644
--- a/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ea2abd.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ea2abd();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_ea2abd();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.glsl
index 870935e..9196974 100644
--- a/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/eb573b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_eb573b();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_eb573b();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
index ecb7330..7a6f3f6 100644
--- a/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ebfb92.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp usampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ebfb92();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_ebfb92();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.glsl
index 976f3b4..2d4b1f3 100644
--- a/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ecc823.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ecc823();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_ecc823();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.glsl
index 766bb7e..4f953c6 100644
--- a/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ee33c5.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ee33c5();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_ee33c5();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.glsl
index 5465695..05eafb9 100644
--- a/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/eecf7d.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_eecf7d();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_eecf7d();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.glsl
index 30742ea..2bed11a 100644
--- a/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ef5405.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ef5405();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_ef5405();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.glsl
index c9f9877..1533645 100644
--- a/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/efa787.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_efa787();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_efa787();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.glsl
index 3f28233..3617d3c 100644
--- a/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f06b69.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f06b69();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_f06b69();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.glsl
index 8bb9383..c15153a 100644
--- a/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f0abad.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f0abad();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_f0abad();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.glsl
index fc5bbee..5691ab6 100644
--- a/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f2a7ff.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f2a7ff();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f2a7ff();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
index 1c7629a..593cbfe 100644
--- a/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f348d9.wgsl.expected.glsl
@@ -91,7 +91,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -112,16 +112,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f348d9();
-  return tint_symbol;
+  VertexOutput v_9 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_9.pos = vec4(0.0f);
+  v_9.prevent_dce = textureLoad_f348d9();
+  return v_9;
 }
 void main() {
-  VertexOutput v_9 = vertex_main_inner();
-  gl_Position = v_9.pos;
+  VertexOutput v_10 = vertex_main_inner();
+  gl_Position = v_10.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_9.prevent_dce;
+  tint_interstage_location0 = v_10.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.glsl
index b1dfe84..3cd0624 100644
--- a/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f35ac7.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f35ac7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f35ac7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.glsl
index d004a39..71cc4df 100644
--- a/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f379e2.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f379e2();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_f379e2();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.glsl
index c5a5838..f51c64e 100644
--- a/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f56e6f.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f56e6f();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_f56e6f();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.glsl
index 2002ea4..a29b6b4 100644
--- a/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f5aee2.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f5aee2();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f5aee2();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.glsl
index 729f6ea..4707544 100644
--- a/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f74bd8.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f74bd8();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_f74bd8();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.glsl
index 91763b0..a6ce779 100644
--- a/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f7f936.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f7f936();
-  return tint_symbol;
+  VertexOutput v_4 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_4.pos = vec4(0.0f);
+  v_4.prevent_dce = textureLoad_f7f936();
+  return v_4;
 }
 void main() {
-  VertexOutput v_4 = vertex_main_inner();
-  gl_Position = v_4.pos;
+  VertexOutput v_5 = vertex_main_inner();
+  gl_Position = v_5.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_4.prevent_dce;
+  tint_interstage_location0 = v_5.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
index b19266e..de0c99e 100644
--- a/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f85291.wgsl.expected.glsl
@@ -81,7 +81,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -97,16 +97,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f85291();
-  return tint_symbol;
+  VertexOutput v_5 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_5.pos = vec4(0.0f);
+  v_5.prevent_dce = textureLoad_f85291();
+  return v_5;
 }
 void main() {
-  VertexOutput v_5 = vertex_main_inner();
-  gl_Position = v_5.pos;
+  VertexOutput v_6 = vertex_main_inner();
+  gl_Position = v_6.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_5.prevent_dce;
+  tint_interstage_location0 = v_6.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.glsl
index ba256e5..b3ca315 100644
--- a/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f8a2e8.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f8a2e8();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_f8a2e8();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.glsl
index 6831a7b..3b7ef4c 100644
--- a/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/f9eaaf.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_f9eaaf();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_f9eaaf();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.glsl
index 2147a86..c070838 100644
--- a/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fc6d36.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fc6d36();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_fc6d36();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.glsl
index ab2934c..64af7c0 100644
--- a/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fcd23d.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fcd23d();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_fcd23d();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.glsl
index 4b9d826..8b4a386 100644
--- a/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fd6442.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fd6442();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureLoad_fd6442();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.glsl
index 20cc00d..e2fbf7a 100644
--- a/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fdebd0.wgsl.expected.glsl
@@ -77,16 +77,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fdebd0();
-  return tint_symbol;
+  VertexOutput v_6 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_6.pos = vec4(0.0f);
+  v_6.prevent_dce = textureLoad_fdebd0();
+  return v_6;
 }
 void main() {
-  VertexOutput v_6 = vertex_main_inner();
-  gl_Position = v_6.pos;
+  VertexOutput v_7 = vertex_main_inner();
+  gl_Position = v_7.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_6.prevent_dce;
+  tint_interstage_location0 = v_7.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.glsl
index 3e407e3..a8daaf1 100644
--- a/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fe0565.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fe0565();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureLoad_fe0565();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.glsl
index 33f43a5..edbb693 100644
--- a/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/fe222a.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_fe222a();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_fe222a();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.glsl
index 71f224d..098e6db 100644
--- a/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/feab99.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_feab99();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureLoad_feab99();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
index 78ff7be..27317fd 100644
--- a/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureLoad/ff1119.wgsl.expected.glsl
@@ -93,7 +93,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray arg_0;
@@ -115,16 +115,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureLoad_ff1119();
-  return tint_symbol;
+  VertexOutput v_10 = VertexOutput(vec4(0.0f), 0.0f);
+  v_10.pos = vec4(0.0f);
+  v_10.prevent_dce = textureLoad_ff1119();
+  return v_10;
 }
 void main() {
-  VertexOutput v_10 = vertex_main_inner();
-  gl_Position = v_10.pos;
+  VertexOutput v_11 = vertex_main_inner();
+  gl_Position = v_11.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_10.prevent_dce;
+  tint_interstage_location0 = v_11.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.glsl
index b5944a3..7425c03 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/0ec222.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_0ec222();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_0ec222();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.glsl
index 1ebb167..f0d8877 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/0fe8dc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_0fe8dc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_0fe8dc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.glsl
index 087e3fb..23a653f 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/26c9f9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_26c9f9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_26c9f9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.glsl
index 80c0ce7..9f9f1f4 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/2d95ea.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_2d95ea();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_2d95ea();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.glsl
index 9a43dd4..31b2d09 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/34cefa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_34cefa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_34cefa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.glsl
index ea797b7..3659f41 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/379cc5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_379cc5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_379cc5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.glsl
index ab87cf3..2aa5252 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/3ad143.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_3ad143();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_3ad143();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.glsl
index 69c5f57..3094d9c 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/3eff89.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_3eff89();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_3eff89();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.glsl
index beb6508..a192c3b 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/485774.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_485774();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_485774();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.glsl
index 5f24ac6..2ad3b75 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/48ef47.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_48ef47();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_48ef47();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.glsl
index 94f7eeb..9b5e5a2 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/4adaad.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_4adaad();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_4adaad();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.glsl
index 24ba54a..2a8252c 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/52dfc5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_52dfc5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_52dfc5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.glsl
index e28a7c7..bcab8b4 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/555f67.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_555f67();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_555f67();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.glsl
index 5497a3f..26eda3b 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/59cc27.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_59cc27();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_59cc27();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.glsl
index b6b3c12..507dcc8 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/5f20d1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_5f20d1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_5f20d1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.glsl
index f1125fe..a505d1e 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/6b4321.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_6b4321();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_6b4321();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.glsl
index 21ef448..da13e4f 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/77be7b.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_77be7b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_77be7b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.glsl
index 3d487ba..d97306e 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/7895f4.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_7895f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_7895f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.glsl
index 65a97ef..ea27921 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/8ac32a.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_8ac32a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_8ac32a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.glsl
index cec7758..d45b928 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/90b8cc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_90b8cc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_90b8cc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.glsl
index e2773e5..435e1fc 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/9c60e3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_9c60e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_9c60e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.glsl
index 6c51ce6..bb9540f 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/a9d3f5.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_a9d3f5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_a9d3f5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.glsl
index 6939a94..f4febd1 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/bf2f76.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_bf2f76();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_bf2f76();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.glsl
index 38ac9b9..d489567 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/c1eca9.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_c1eca9();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_c1eca9();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.glsl
index a0989c8..2d2730f5 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/d3e21f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_d3e21f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_d3e21f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.glsl
index d1c2fb1..624f70e 100644
--- a/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLayers/f1783f.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLayers_f1783f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0u);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureNumLayers_f1783f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
index 0d815c8..1304abd 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/181090.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_181090();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_181090();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
index 1243ab6..838ae36 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a3fa9.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_1a3fa9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_1a3fa9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
index bc6117b..4d384b3 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_1a7fc3();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_1a7fc3();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
index 8cd1af2..68deb36 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2267d8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2267d8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2267d8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
index cf76141..1a29c87 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/24b2c6.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_24b2c6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_24b2c6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
index 339b716..8d31df0 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2bea6c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2bea6c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2bea6c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
index 993959f..feeb854 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/2df1ab.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_2df1ab();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_2df1ab();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
index 9022767..3f9d2ab 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/46dbd8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_46dbd8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_46dbd8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
index ffa1a91..5884e60 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/60d9b8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_60d9b8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_60d9b8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
index 375ef75..8dc8372 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/903920.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_903920();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_903920();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
index c8c2abc..915c619 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/9a1a65.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_9a1a65();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_9a1a65();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
index 11ca594..1189e67 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/adc783.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_adc783();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_adc783();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
index 45437c3..ae95b74 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/ae911c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_ae911c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_ae911c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
index 2e10a32..bd3076c 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c386c8.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c386c8();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c386c8();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
index a826c08..838e24d 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c399f9();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c399f9();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
index 60fb1a7..5c9ba46 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/c8c25c.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_c8c25c();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_c8c25c();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
index a80ac89..ac68e0c 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/d63126.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_d63126();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_d63126();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
index 80af959..def457f 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/d8f73b.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_d8f73b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_d8f73b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
index cd4d897..c319d7e 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/ef7944.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_ef7944();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_ef7944();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
index a7f5a73..9ee8b10 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/efd6df.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_efd6df();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_efd6df();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
index 9446e07..09d7cb6 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_f742c0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_f742c0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
index b3165b9..c12eef7 100644
--- a/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumLevels/fe2171.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumLevels_fe2171();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumLevels_fe2171();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
index bebce6b..11cadf1 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/50f399.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_50f399();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_50f399();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
index 2dc50c5..368cf03 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/c1a777.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_c1a777();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_c1a777();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
index 0afde1a4..c596e62 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/dbb799.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_dbb799();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_dbb799();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
index 79ca71d..5bc8e8f 100644
--- a/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureNumSamples/ecd321.wgsl.expected.glsl
@@ -67,7 +67,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 layout(location = 0) flat out uint tint_interstage_location0;
@@ -76,16 +76,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0u);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureNumSamples_ecd321();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), 0u);
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureNumSamples_ecd321();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
index 650fa0b..a772509 100644
--- a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/7c04e6.wgsl.expected.glsl
@@ -337,16 +337,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleBaseClampToEdge_7c04e6();
-  return tint_symbol;
+  VertexOutput v_13 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_13.pos = vec4(0.0f);
+  v_13.prevent_dce = textureSampleBaseClampToEdge_7c04e6();
+  return v_13;
 }
 void main() {
-  VertexOutput v_13 = vertex_main_inner();
-  gl_Position = v_13.pos;
+  VertexOutput v_14 = vertex_main_inner();
+  gl_Position = v_14.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_13.prevent_dce;
+  tint_interstage_location0 = v_14.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
index b71e007..6e0ae77 100644
--- a/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleBaseClampToEdge/9ca02c.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleBaseClampToEdge_9ca02c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleBaseClampToEdge_9ca02c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
index c2bdedf..f60e09a 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_1116ed();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_1116ed();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
index d7181ed..6544492 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_1568e3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_1568e3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
index 0bfe2c7..54779c5 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_2ad2b1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_2ad2b1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
index 75a7048..90a8b77 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_4cf3a2();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_4cf3a2();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
index ef5f229..d7f184d 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/7dc3c0.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_7dc3c0();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_7dc3c0();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
index 18605df..5ba61bf 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/7f2b9a.wgsl.expected.glsl
@@ -59,16 +59,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_7f2b9a();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleCompareLevel_7f2b9a();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.glsl
index e80caad..57a3c91 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/958c87.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_958c87();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_958c87();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
index 07946ea..2b2a1ea 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/b6e47c.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_b6e47c();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_b6e47c();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
index 37afd2a..a53916f 100644
--- a/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleCompareLevel/bcb3dd.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleCompareLevel_bcb3dd();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleCompareLevel_bcb3dd();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.glsl
index a2e3a8b..99645e2 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/21402b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_21402b();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_21402b();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.glsl
index ffd3536..d4124ce 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/2ecd8f.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_2ecd8f();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_2ecd8f();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.glsl
index 1541e62..493f774 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/521263.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_521263();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_521263();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.glsl
index 18e4afb..ef76177 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/5312f4.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_5312f4();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_5312f4();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.glsl
index a24d5aa..7a14823 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/5884dd.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_5884dd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_5884dd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.glsl
index 4b8de92..4376801 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/7cd6de.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_7cd6de();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_7cd6de();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.glsl
index 49d3ee5..c57c179 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/a09131.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_a09131();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_a09131();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.glsl
index 6b14a69..be9c70c 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/bbb58f.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_bbb58f();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_bbb58f();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.glsl
index ee7caca..aa02492 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/d4e3c5.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_d4e3c5();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = textureSampleGrad_d4e3c5();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.glsl
index 0ac9217..b2eee7e 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/d65515.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_d65515();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_d65515();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.glsl
index 7eba64c..731f06f 100644
--- a/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleGrad/e383db.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleGrad_e383db();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleGrad_e383db();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.glsl
index 905c751..778a7b8 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/02be59.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_02be59();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_02be59();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.glsl
index dd8abfc..cef3d23 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/0b0a1b.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_0b0a1b();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_0b0a1b();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.glsl
index 488d121..d7af1fec 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/0bdd9a.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_0bdd9a();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_0bdd9a();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.glsl
index 5a4fc03..393f427 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/1b0291.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_1b0291();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_1b0291();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.glsl
index aaa6afb..63abf76 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/1bf73e.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_1bf73e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_1bf73e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.glsl
index 0574b76..5439d7e 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/265cc7.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_265cc7();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_265cc7();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.glsl
index 6a38087..1d8efd2 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/2974eb.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_2974eb();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_2974eb();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.glsl
index 277990c..8a64f77 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/302be4.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_302be4();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_302be4();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.glsl
index ec711b2..12b5858 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/36780e.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_36780e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_36780e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.glsl
index cb69187..9f58bae 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/36f0d3.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_36f0d3();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_36f0d3();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.glsl
index 5575a08..9c925ec 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/3c3442.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_3c3442();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_3c3442();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.glsl
index 3c68a67..f13c61c 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/615583.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_615583();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_615583();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.glsl
index 8891040..a26302f 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/73e892.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_73e892();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_73e892();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.glsl
index 1d61164..d6fa367 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/749baf.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_749baf();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_749baf();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.glsl
index 8619cf5..c616a1a 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/941a53.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_941a53();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_941a53();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.glsl
index efa7119..be9b430 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/a12142.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_a12142();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_a12142();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.glsl
index 6e8129d..ecf3443 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/aab3b9.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_aab3b9();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_aab3b9();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.glsl
index e1023f1..f147cb6 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/abfcc0.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_abfcc0();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_abfcc0();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.glsl
index 7f5a82b..bd3c5a7 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ae5e39.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ae5e39();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_ae5e39();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.glsl
index 46eadf4..1c2ee04 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ae92a2.wgsl.expected.glsl
@@ -68,16 +68,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ae92a2();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_ae92a2();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.glsl
index 22c997b..3ad2f97 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/b7c55c.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_b7c55c();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_b7c55c();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.glsl
index 27e39e1..3167631 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/c32df7.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_c32df7();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_c32df7();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.glsl
index f3add6b..91e352d 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/c6aca6.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_c6aca6();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_c6aca6();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.glsl
index 2b045c5..f38edf0 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/cdfe0f.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_cdfe0f();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_cdfe0f();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.glsl
index 321d095..7efac01 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/dcbecb.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_dcbecb();
-  return tint_symbol;
+  VertexOutput v_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_1.pos = vec4(0.0f);
+  v_1.prevent_dce = textureSampleLevel_dcbecb();
+  return v_1;
 }
 void main() {
-  VertexOutput v_1 = vertex_main_inner();
-  gl_Position = v_1.pos;
+  VertexOutput v_2 = vertex_main_inner();
+  gl_Position = v_2.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_1.prevent_dce;
+  tint_interstage_location0 = v_2.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.glsl
index 09563d3..66e87d5 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/e6ce9e.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_e6ce9e();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_e6ce9e();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.glsl
index c6badea..c217f9f 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/f3b2c8.wgsl.expected.glsl
@@ -65,16 +65,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_f3b2c8();
-  return tint_symbol;
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), 0.0f);
+  v_2.pos = vec4(0.0f);
+  v_2.prevent_dce = textureSampleLevel_f3b2c8();
+  return v_2;
 }
 void main() {
-  VertexOutput v_2 = vertex_main_inner();
-  gl_Position = v_2.pos;
+  VertexOutput v_3 = vertex_main_inner();
+  gl_Position = v_3.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_2.prevent_dce;
+  tint_interstage_location0 = v_3.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.glsl
index 1259a15..0f5c761 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/faa6d7.wgsl.expected.glsl
@@ -71,16 +71,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_faa6d7();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_faa6d7();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.glsl
index 6452ba2..b5d52df 100644
--- a/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/textureSampleLevel/ff11bc.wgsl.expected.glsl
@@ -74,16 +74,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = textureSampleLevel_ff11bc();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), 0.0f);
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = textureSampleLevel_ff11bc();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.glsl
index fc0b162..6034d33 100644
--- a/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/06794e.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_06794e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_06794e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.glsl
index d9f6627..bdfa7f8 100644
--- a/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/2585cd.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_2585cd();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_2585cd();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.glsl
index 8de7fe9..8cc1602 100644
--- a/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/31d679.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_31d679();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_31d679();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.glsl
index a9d2084..eaeba73 100644
--- a/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/31e37e.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_31e37e();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_31e37e();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.glsl
index a7b7ae6..804c382 100644
--- a/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/32dd64.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4x3 res = mat4x3(vec3(1.0f), vec3(1.0f), vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_32dd64();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.glsl
index 3f30487..515b2f3 100644
--- a/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/4ce359.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_4ce359();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_4ce359();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.glsl
index 4572f9e..77db51e 100644
--- a/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/4dc9a1.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_4dc9a1();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_4dc9a1();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.glsl
index 591449d..480ed6f 100644
--- a/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/553e90.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2x4 res = mat2x4(vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_553e90();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.glsl
index a8ef5f7..3955e5e 100644
--- a/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/5c133c.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3x4 res = mat3x4(vec4(1.0f), vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_5c133c();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.glsl
index 11c8419..af47ba7 100644
--- a/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/5edd96.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_5edd96();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_5edd96();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.glsl
index 9941da8..8bb30b2 100644
--- a/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/5f36bf.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_5f36bf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_5f36bf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.glsl
index 7e22697..290bc3d0 100644
--- a/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/66fce8.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3 res = mat3(vec3(1.0f), vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_66fce8();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.glsl
index b0497fb..5e3ea74 100644
--- a/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/70ca11.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat3x2 res = mat3x2(vec2(1.0f), vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_70ca11();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.glsl
index b612a82..7f24dca 100644
--- a/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/7be8b2.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_7be8b2();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_7be8b2();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.glsl
index 5cec110..761a87e 100644
--- a/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/7eb2c5.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2 res = mat2(vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_7eb2c5();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.glsl
index c1f005f..e68008e 100644
--- a/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/844869.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_844869();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_844869();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.glsl
index 53a4bfa..760f158 100644
--- a/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/84a763.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4x2 res = mat4x2(vec2(1.0f), vec2(1.0f), vec2(1.0f), vec2(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_84a763();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.glsl
index f1a4fe7..04cad35 100644
--- a/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/854336.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_854336();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_854336();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.glsl
index 2661d25..ef7ec5a 100644
--- a/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/8c06ce.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_8c06ce();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_8c06ce();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.glsl
index 1a4eaa6..0b7a144 100644
--- a/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/ace596.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat2x3 res = mat2x3(vec3(1.0f), vec3(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_ace596();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.glsl
index 3416a01..77aae7c 100644
--- a/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/b9ad1f.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_b9ad1f();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_b9ad1f();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.glsl
index 2375e46..e588af3 100644
--- a/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/c1b600.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_c1b600();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_c1b600();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.glsl
index bf2ae1a..acb1e9b 100644
--- a/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/d6faec.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_d6faec();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_d6faec();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.glsl
index 3fff4aa..afdf088 100644
--- a/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/d8f8ba.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_d8f8ba();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_d8f8ba();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.glsl
index da3cdb7..b5ead55 100644
--- a/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/dc671a.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   mat4 res = mat4(vec4(1.0f), vec4(1.0f), vec4(1.0f), vec4(1.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   transpose_dc671a();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.glsl
index d71c8ba..458843d 100644
--- a/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/ed4bdc.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return mix(0, 1, (res[0u].x == 0.0f));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_ed4bdc();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_ed4bdc();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.glsl b/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.glsl
index cb26bf7..9bfaad6 100644
--- a/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/transpose/faeb05.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return mix(0, 1, (res[0u].x == 0.0hf));
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = transpose_faeb05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = transpose_faeb05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.glsl
index c1536da..52e29f0 100644
--- a/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/103ab8.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_103ab8();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec3(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_103ab8();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.glsl
index 2d15e08..c1d2080 100644
--- a/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/117396.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec3 res = vec3(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_117396();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.glsl
index 58b7523..b508801 100644
--- a/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/562d05.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec3(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_562d05();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec3(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_562d05();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.glsl
index de465c0..78cf001 100644
--- a/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/7d6ded.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   float res = 1.0f;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_7d6ded();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.glsl
index 2e9ac10..2662bdd 100644
--- a/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/a56109.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_a56109();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec2(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_a56109();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.glsl
index 21791e4..7085f60 100644
--- a/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/c12555.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec2 res = vec2(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_c12555();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.glsl
index eb136a2..e612a15 100644
--- a/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/cc2b0d.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0hf);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_cc2b0d();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0hf);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_cc2b0d();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.glsl
index 96d0836..47644c4 100644
--- a/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/ce7c17.wgsl.expected.glsl
@@ -56,16 +56,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_ce7c17();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), f16vec4(0.0hf));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_ce7c17();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.glsl
index fd4d566..a14a459 100644
--- a/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/e183aa.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_e183aa();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_e183aa();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.glsl
index c1d3563..1f6eb61 100644
--- a/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/eb83df.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), 0.0f);
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_eb83df();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), 0.0f);
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_eb83df();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.glsl
index c0a74c6..f026c59 100644
--- a/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/f0f1a1.wgsl.expected.glsl
@@ -37,10 +37,10 @@
   vec4 res = vec4(1.0f);
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
+  VertexOutput v = VertexOutput(vec4(0.0f));
+  v.pos = vec4(0.0f);
   trunc_f0f1a1();
-  return tint_symbol;
+  return v;
 }
 void main() {
   gl_Position = vertex_main_inner().pos;
diff --git a/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.glsl b/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.glsl
index ec1d30e..2aae61b 100644
--- a/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/trunc/f370d3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = trunc_f370d3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = trunc_f370d3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.glsl
index a313ddc..57b63b7 100644
--- a/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack2x16float/32a5cf.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16float_32a5cf();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16float_32a5cf();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.glsl
index 214a754..317cd67 100644
--- a/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack2x16snorm/b4aea6.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16snorm_b4aea6();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16snorm_b4aea6();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.glsl
index f245cda..5ccbfe1 100644
--- a/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack2x16unorm/7699c0.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec2(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack2x16unorm_7699c0();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec2(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack2x16unorm_7699c0();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.glsl
index 33b508b..31601b3 100644
--- a/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack4x8snorm/523fb3.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4x8snorm_523fb3();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4x8snorm_523fb3();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.glsl
index ca61827..3f795f6 100644
--- a/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack4x8unorm/750c74.wgsl.expected.glsl
@@ -53,16 +53,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4x8unorm_750c74();
-  return tint_symbol;
+  VertexOutput v = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v.pos = vec4(0.0f);
+  v.prevent_dce = unpack4x8unorm_750c74();
+  return v;
 }
 void main() {
-  VertexOutput v = vertex_main_inner();
-  gl_Position = v.pos;
+  VertexOutput v_1 = vertex_main_inner();
+  gl_Position = v_1.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v.prevent_dce;
+  tint_interstage_location0 = v_1.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.glsl
index a16c098..4b5b335 100644
--- a/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack4xI8/830900.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), ivec4(0));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4xI8_830900();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), ivec4(0));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = unpack4xI8_830900();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.glsl b/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.glsl
index c006287..87e4ec8 100644
--- a/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/unpack4xU8/a5ea55.wgsl.expected.glsl
@@ -62,16 +62,16 @@
   return res;
 }
 VertexOutput vertex_main_inner() {
-  VertexOutput tint_symbol = VertexOutput(vec4(0.0f), uvec4(0u));
-  tint_symbol.pos = vec4(0.0f);
-  tint_symbol.prevent_dce = unpack4xU8_a5ea55();
-  return tint_symbol;
+  VertexOutput v_3 = VertexOutput(vec4(0.0f), uvec4(0u));
+  v_3.pos = vec4(0.0f);
+  v_3.prevent_dce = unpack4xU8_a5ea55();
+  return v_3;
 }
 void main() {
-  VertexOutput v_3 = vertex_main_inner();
-  gl_Position = v_3.pos;
+  VertexOutput v_4 = vertex_main_inner();
+  gl_Position = v_4.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  tint_interstage_location0 = v_3.prevent_dce;
+  tint_interstage_location0 = v_4.prevent_dce;
   gl_PointSize = 1.0f;
 }
diff --git a/test/tint/builtins/modf/scalar/const.wgsl.expected.glsl b/test/tint/builtins/modf/scalar/const.wgsl.expected.glsl
index 48b31a9..f67c037 100644
--- a/test/tint/builtins/modf/scalar/const.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/scalar/const.wgsl.expected.glsl
@@ -2,13 +2,13 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   modf_result_f32 res = modf_result_f32(0.25f, 1.0f);
-  float tint_symbol_2 = res.fract;
+  float v = res.member_0;
   float whole = res.whole;
 }
diff --git a/test/tint/builtins/modf/scalar/const_members.wgsl.expected.glsl b/test/tint/builtins/modf/scalar/const_members.wgsl.expected.glsl
index aed7821..f18b7ba 100644
--- a/test/tint/builtins/modf/scalar/const_members.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/scalar/const_members.wgsl.expected.glsl
@@ -2,6 +2,6 @@
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  float tint_symbol_2 = 0.25f;
+  float v = 0.25f;
   float whole = 1.0f;
 }
diff --git a/test/tint/builtins/modf/scalar/mixed.wgsl.expected.glsl b/test/tint/builtins/modf/scalar/mixed.wgsl.expected.glsl
index 726a6b2..f14cb81 100644
--- a/test/tint/builtins/modf/scalar/mixed.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/scalar/mixed.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
@@ -11,9 +11,9 @@
   float runtime_in = 1.25f;
   modf_result_f32 res = modf_result_f32(0.25f, 1.0f);
   modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(runtime_in, v.whole);
+  v.member_0 = modf(runtime_in, v.whole);
   res = v;
   res = modf_result_f32(0.25f, 1.0f);
-  float tint_symbol_1 = res.fract;
+  float v_1 = res.member_0;
   float whole = res.whole;
 }
diff --git a/test/tint/builtins/modf/scalar/runtime.wgsl.expected.glsl b/test/tint/builtins/modf/scalar/runtime.wgsl.expected.glsl
index b455542..bb219ab 100644
--- a/test/tint/builtins/modf/scalar/runtime.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/scalar/runtime.wgsl.expected.glsl
@@ -2,16 +2,16 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  float tint_symbol_1 = 1.25f;
-  modf_result_f32 v = modf_result_f32(0.0f, 0.0f);
-  v.fract = modf(tint_symbol_1, v.whole);
-  modf_result_f32 res = v;
-  float tint_symbol_2 = res.fract;
+  float v = 1.25f;
+  modf_result_f32 v_1 = modf_result_f32(0.0f, 0.0f);
+  v_1.member_0 = modf(v, v_1.whole);
+  modf_result_f32 res = v_1;
+  float v_2 = res.member_0;
   float whole = res.whole;
 }
diff --git a/test/tint/builtins/modf/vector/const.wgsl.expected.glsl b/test/tint/builtins/modf/vector/const.wgsl.expected.glsl
index 287bcbb..aa9dabd 100644
--- a/test/tint/builtins/modf/vector/const.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/vector/const.wgsl.expected.glsl
@@ -2,13 +2,13 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   modf_result_vec2_f32 res = modf_result_vec2_f32(vec2(0.25f, 0.75f), vec2(1.0f, 3.0f));
-  vec2 tint_symbol_2 = res.fract;
+  vec2 v = res.member_0;
   vec2 whole = res.whole;
 }
diff --git a/test/tint/builtins/modf/vector/const_members.wgsl.expected.glsl b/test/tint/builtins/modf/vector/const_members.wgsl.expected.glsl
index 26b91d3..ce88372 100644
--- a/test/tint/builtins/modf/vector/const_members.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/vector/const_members.wgsl.expected.glsl
@@ -2,6 +2,6 @@
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  vec2 tint_symbol_2 = vec2(0.25f, 0.75f);
+  vec2 v = vec2(0.25f, 0.75f);
   vec2 whole = vec2(1.0f, 3.0f);
 }
diff --git a/test/tint/builtins/modf/vector/mixed.wgsl.expected.glsl b/test/tint/builtins/modf/vector/mixed.wgsl.expected.glsl
index 1914fdd..ba4e62d 100644
--- a/test/tint/builtins/modf/vector/mixed.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/vector/mixed.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
@@ -11,9 +11,9 @@
   vec2 runtime_in = vec2(1.25f, 3.75f);
   modf_result_vec2_f32 res = modf_result_vec2_f32(vec2(0.25f, 0.75f), vec2(1.0f, 3.0f));
   modf_result_vec2_f32 v = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
-  v.fract = modf(runtime_in, v.whole);
+  v.member_0 = modf(runtime_in, v.whole);
   res = v;
   res = modf_result_vec2_f32(vec2(0.25f, 0.75f), vec2(1.0f, 3.0f));
-  vec2 tint_symbol_1 = res.fract;
+  vec2 v_1 = res.member_0;
   vec2 whole = res.whole;
 }
diff --git a/test/tint/builtins/modf/vector/runtime.wgsl.expected.glsl b/test/tint/builtins/modf/vector/runtime.wgsl.expected.glsl
index 3afd7fb..4e7c2d3 100644
--- a/test/tint/builtins/modf/vector/runtime.wgsl.expected.glsl
+++ b/test/tint/builtins/modf/vector/runtime.wgsl.expected.glsl
@@ -2,16 +2,16 @@
 
 
 struct modf_result_vec2_f32 {
-  vec2 fract;
+  vec2 member_0;
   vec2 whole;
 };
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  vec2 tint_symbol_1 = vec2(1.25f, 3.75f);
-  modf_result_vec2_f32 v = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
-  v.fract = modf(tint_symbol_1, v.whole);
-  modf_result_vec2_f32 res = v;
-  vec2 tint_symbol_2 = res.fract;
+  vec2 v = vec2(1.25f, 3.75f);
+  modf_result_vec2_f32 v_1 = modf_result_vec2_f32(vec2(0.0f), vec2(0.0f));
+  v_1.member_0 = modf(v, v_1.whole);
+  modf_result_vec2_f32 res = v_1;
+  vec2 v_2 = res.member_0;
   vec2 whole = res.whole;
 }
diff --git a/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.glsl b/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.glsl
index 0d908dd..6cad056 100644
--- a/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.glsl
+++ b/test/tint/builtins/textureLoad/texture_external_param.wgsl.expected.glsl
@@ -96,8 +96,8 @@
   }
   return vec4(v_13, v_6);
 }
-vec4 textureLoad2d(tint_ExternalTextureParams tint_symbol_params, ivec2 coords) {
-  return tint_TextureLoadExternal(tint_symbol_params, min(uvec2(coords), ((tint_symbol_params.apparentSize + uvec2(1u)) - uvec2(1u))));
+vec4 textureLoad2d(tint_ExternalTextureParams texture_params, ivec2 coords) {
+  return tint_TextureLoadExternal(texture_params, min(uvec2(coords), ((texture_params.apparentSize + uvec2(1u)) - uvec2(1u))));
 }
 tint_ExternalTextureParams tint_convert_tint_ExternalTextureParams(tint_ExternalTextureParams_std140 tint_input) {
   mat3 v_14 = mat3(tint_input.gamutConversionMatrix_col0, tint_input.gamutConversionMatrix_col1, tint_input.gamutConversionMatrix_col2);
@@ -217,8 +217,8 @@
   }
   return vec4(v_13, v_6);
 }
-vec4 textureLoad2d(tint_ExternalTextureParams tint_symbol_params, ivec2 coords) {
-  return tint_TextureLoadExternal(tint_symbol_params, min(uvec2(coords), ((tint_symbol_params.apparentSize + uvec2(1u)) - uvec2(1u))));
+vec4 textureLoad2d(tint_ExternalTextureParams texture_params, ivec2 coords) {
+  return tint_TextureLoadExternal(texture_params, min(uvec2(coords), ((texture_params.apparentSize + uvec2(1u)) - uvec2(1u))));
 }
 tint_ExternalTextureParams tint_convert_tint_ExternalTextureParams(tint_ExternalTextureParams_std140 tint_input) {
   mat3 v_14 = mat3(tint_input.gamutConversionMatrix_col0, tint_input.gamutConversionMatrix_col1, tint_input.gamutConversionMatrix_col2);
@@ -329,8 +329,8 @@
   }
   return vec4(v_13, v_6);
 }
-vec4 textureLoad2d(tint_ExternalTextureParams tint_symbol_params, ivec2 coords) {
-  return tint_TextureLoadExternal(tint_symbol_params, min(uvec2(coords), ((tint_symbol_params.apparentSize + uvec2(1u)) - uvec2(1u))));
+vec4 textureLoad2d(tint_ExternalTextureParams texture_params, ivec2 coords) {
+  return tint_TextureLoadExternal(texture_params, min(uvec2(coords), ((texture_params.apparentSize + uvec2(1u)) - uvec2(1u))));
 }
 tint_ExternalTextureParams tint_convert_tint_ExternalTextureParams(tint_ExternalTextureParams_std140 tint_input) {
   mat3 v_14 = mat3(tint_input.gamutConversionMatrix_col0, tint_input.gamutConversionMatrix_col1, tint_input.gamutConversionMatrix_col2);
diff --git a/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl b/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
index d1bcb6f..1260821 100644
--- a/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
+++ b/test/tint/builtins/textureLoad/texture_param.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 };
 
 layout(binding = 0, std140)
-uniform v_tint_symbol_1_ubo {
+uniform v_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -45,7 +45,7 @@
 };
 
 layout(binding = 0, std140)
-uniform f_tint_symbol_1_ubo {
+uniform f_tint_symbol_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
@@ -72,7 +72,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp isampler2D arg_0;
diff --git a/test/tint/const/global/global.wgsl.expected.glsl b/test/tint/const/global/global.wgsl.expected.glsl
index 1d40546..8cbe249 100644
--- a/test/tint/const/global/global.wgsl.expected.glsl
+++ b/test/tint/const/global/global.wgsl.expected.glsl
@@ -2,8 +2,8 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   int v1 = 1;
   uint v2 = 1u;
   float v3 = 1.0f;
@@ -15,5 +15,5 @@
   return vec4(0.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/const/inferred/function.wgsl.expected.glsl b/test/tint/const/inferred/function.wgsl.expected.glsl
index dec2b19..ef11109 100644
--- a/test/tint/const/inferred/function.wgsl.expected.glsl
+++ b/test/tint/const/inferred/function.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/diagnostic_filtering/case_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/case_body_attribute.wgsl.expected.glsl
index 271e9ae..86c0de2 100644
--- a/test/tint/diagnostic_filtering/case_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/case_body_attribute.wgsl.expected.glsl
@@ -19,7 +19,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   switch(tint_f32_to_i32(x)) {
     case 0:
     {
@@ -33,5 +33,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/compound_statement_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/compound_statement_attribute.wgsl.expected.glsl
index c36e64f..91da9b3 100644
--- a/test/tint/diagnostic_filtering/compound_statement_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/compound_statement_attribute.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/default_case_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/default_case_body_attribute.wgsl.expected.glsl
index deeb608..fe7df43 100644
--- a/test/tint/diagnostic_filtering/default_case_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/default_case_body_attribute.wgsl.expected.glsl
@@ -19,7 +19,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   switch(tint_f32_to_i32(x)) {
     default:
     {
@@ -29,5 +29,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/directive.wgsl.expected.glsl b/test/tint/diagnostic_filtering/directive.wgsl.expected.glsl
index 06c6f85..ba26cd2 100644
--- a/test/tint/diagnostic_filtering/directive.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/directive.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/else_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/else_body_attribute.wgsl.expected.glsl
index 23cd6d3..6d575ac 100644
--- a/test/tint/diagnostic_filtering/else_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/else_body_attribute.wgsl.expected.glsl
@@ -16,12 +16,12 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
   } else {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/else_if_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/else_if_body_attribute.wgsl.expected.glsl
index 28617b9..5789b27 100644
--- a/test/tint/diagnostic_filtering/else_if_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/else_if_body_attribute.wgsl.expected.glsl
@@ -16,7 +16,7 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
   } else {
     if ((x < 0.0f)) {
@@ -25,5 +25,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/for_loop_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/for_loop_attribute.wgsl.expected.glsl
index e133bc2..8c47d0e 100644
--- a/test/tint/diagnostic_filtering/for_loop_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/for_loop_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   vec4 v = vec4(0.0f);
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -44,5 +44,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/for_loop_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/for_loop_body_attribute.wgsl.expected.glsl
index 352bea4..e37d2e1 100644
--- a/test/tint/diagnostic_filtering/for_loop_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/for_loop_body_attribute.wgsl.expected.glsl
@@ -16,7 +16,7 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   vec4 v = vec4(0.0f);
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -40,5 +40,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/function_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/function_attribute.wgsl.expected.glsl
index ef8c21e..5641302 100644
--- a/test/tint/diagnostic_filtering/function_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/function_attribute.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/function_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/function_body_attribute.wgsl.expected.glsl
index 12f3294..8f7a87c 100644
--- a/test/tint/diagnostic_filtering/function_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/function_body_attribute.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/if_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/if_body_attribute.wgsl.expected.glsl
index 7656481..14f0a0b 100644
--- a/test/tint/diagnostic_filtering/if_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/if_body_attribute.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
     texture(t_s, vec2(0.0f));
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/if_statement_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/if_statement_attribute.wgsl.expected.glsl
index 4b11f34..6fb6c36 100644
--- a/test/tint/diagnostic_filtering/if_statement_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/if_statement_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   if ((x > 0.0f)) {
   } else {
     if ((dFdx(1.0f) > 0.0f)) {
@@ -23,5 +23,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/loop_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/loop_attribute.wgsl.expected.glsl
index 11db8c8..f66698a 100644
--- a/test/tint/diagnostic_filtering/loop_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/loop_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
@@ -35,5 +35,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/loop_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/loop_body_attribute.wgsl.expected.glsl
index d73f134..5601726 100644
--- a/test/tint/diagnostic_filtering/loop_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/loop_body_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
@@ -35,5 +35,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/loop_continuing_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/loop_continuing_attribute.wgsl.expected.glsl
index a2b02b8..7e05dff 100644
--- a/test/tint/diagnostic_filtering/loop_continuing_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/loop_continuing_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
@@ -35,5 +35,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/switch_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/switch_body_attribute.wgsl.expected.glsl
index 2234324..4fb101f 100644
--- a/test/tint/diagnostic_filtering/switch_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/switch_body_attribute.wgsl.expected.glsl
@@ -18,7 +18,7 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   switch(tint_f32_to_i32(x)) {
     default:
     {
@@ -28,5 +28,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/switch_statement_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/switch_statement_attribute.wgsl.expected.glsl
index 7a36c9d..24a67a1 100644
--- a/test/tint/diagnostic_filtering/switch_statement_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/switch_statement_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   bool v = false;
   if ((x == 0.0f)) {
     v = (dFdx(1.0f) == 0.0f);
@@ -30,5 +30,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/while_loop_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/while_loop_attribute.wgsl.expected.glsl
index bdb8b93..50f7d4f 100644
--- a/test/tint/diagnostic_filtering/while_loop_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/while_loop_attribute.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 precision highp int;
 
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   vec4 v = vec4(0.0f);
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -44,5 +44,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/diagnostic_filtering/while_loop_body_attribute.wgsl.expected.glsl b/test/tint/diagnostic_filtering/while_loop_body_attribute.wgsl.expected.glsl
index 81b46df..90fba3d 100644
--- a/test/tint/diagnostic_filtering/while_loop_body_attribute.wgsl.expected.glsl
+++ b/test/tint/diagnostic_filtering/while_loop_body_attribute.wgsl.expected.glsl
@@ -16,7 +16,7 @@
 
 uniform highp sampler2D t_s;
 layout(location = 0) in float tint_interstage_location0;
-void tint_symbol_inner(float x) {
+void main_inner(float x) {
   vec4 v = vec4(0.0f);
   {
     uvec2 tint_loop_idx = uvec2(0u);
@@ -40,5 +40,5 @@
   }
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0);
+  main_inner(tint_interstage_location0);
 }
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f16.wgsl.expected.glsl
index 282e97c..038e5b7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.glsl
index 3c9ada6..d35f964 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f16.wgsl.expected.glsl
index f42eb98..6465781 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl
index 7d60c03..b1c2dc7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f16.wgsl.expected.glsl
index f42eb98..6465781 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl
index 7d60c03..b1c2dc7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f16.wgsl.expected.glsl
index 282e97c..038e5b7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.glsl
index 3c9ada6..d35f964 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.glsl
index 55306ca..5962d4a 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f16.wgsl.expected.glsl
index f42eb98..6465781 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl
index 7d60c03..b1c2dc7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.glsl
index 55306ca..5962d4a 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f16.wgsl.expected.glsl
index f42eb98..6465781 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl
index 7d60c03..b1c2dc7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/load/f16.wgsl.expected.glsl
index 87e03be..01a6509 100644
--- a/test/tint/expressions/type_ctor/mat2x2/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/load/f32.wgsl.expected.glsl
index 6af8349..b6cf525 100644
--- a/test/tint/expressions/type_ctor/mat2x2/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/zero/f16.wgsl.expected.glsl
index 213355b..817db95 100644
--- a/test/tint/expressions/type_ctor/mat2x2/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2 m = f16mat2(f16vec2(0.0hf), f16vec2(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.glsl
index ab06521..d4e96b7 100644
--- a/test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2 m = mat2(vec2(0.0f), vec2(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f16.wgsl.expected.glsl
index 5369576..cc9d71b 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.glsl
index 54131f3..7d7df5a 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f16.wgsl.expected.glsl
index 8b5ea10..2e93dfa 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl
index c5a2707..0a572a6 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f16.wgsl.expected.glsl
index 8b5ea10..2e93dfa 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl
index c5a2707..0a572a6 100644
--- a/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f16.wgsl.expected.glsl
index 5369576..cc9d71b 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.glsl
index 54131f3..7d7df5a 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.glsl
index 8a72d34..49b455c 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f16.wgsl.expected.glsl
index 8b5ea10..2e93dfa 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl
index c5a2707..0a572a6 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.glsl
index 8a72d34..49b455c 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f16.wgsl.expected.glsl
index 8b5ea10..2e93dfa 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl
index c5a2707..0a572a6 100644
--- a/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/load/f16.wgsl.expected.glsl
index a6a8aad..dcbbba0 100644
--- a/test/tint/expressions/type_ctor/mat2x3/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/load/f32.wgsl.expected.glsl
index 5e6ab24..f211a62 100644
--- a/test/tint/expressions/type_ctor/mat2x3/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/zero/f16.wgsl.expected.glsl
index 5c03fcc..92942c3 100644
--- a/test/tint/expressions/type_ctor/mat2x3/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x3 m = f16mat2x3(f16vec3(0.0hf), f16vec3(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x3/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x3/zero/f32.wgsl.expected.glsl
index e12c68e..1ef8cb9 100644
--- a/test/tint/expressions/type_ctor/mat2x3/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x3/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x3 m = mat2x3(vec3(0.0f), vec3(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat2x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f16.wgsl.expected.glsl
index 5f97101..7beb269 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f32.wgsl.expected.glsl
index 9980978..826da27 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f16.wgsl.expected.glsl
index 1986258..9010bbf 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl
index 209caf3..02dc89b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f16.wgsl.expected.glsl
index 1986258..9010bbf 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl
index 209caf3..02dc89b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f16.wgsl.expected.glsl
index 5f97101..7beb269 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f32.wgsl.expected.glsl
index 9980978..826da27 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/abstract-float.wgsl.expected.glsl
index 4dbc567..ac35a4b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f16.wgsl.expected.glsl
index 1986258..9010bbf 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl
index 209caf3..02dc89b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/abstract-float.wgsl.expected.glsl
index 4dbc567..ac35a4b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f16.wgsl.expected.glsl
index 1986258..9010bbf 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl
index 209caf3..02dc89b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/load/f16.wgsl.expected.glsl
index 07235ab..abc4e02 100644
--- a/test/tint/expressions/type_ctor/mat2x4/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/load/f32.wgsl.expected.glsl
index 349914a..27b9bc7 100644
--- a/test/tint/expressions/type_ctor/mat2x4/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/zero/f16.wgsl.expected.glsl
index 1c0d9d8..7961653 100644
--- a/test/tint/expressions/type_ctor/mat2x4/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat2x4 m = f16mat2x4(f16vec4(0.0hf), f16vec4(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat2x4/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat2x4/zero/f32.wgsl.expected.glsl
index b26479c..724d69b 100644
--- a/test/tint/expressions/type_ctor/mat2x4/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat2x4/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat2x4 m = mat2x4(vec4(0.0f), vec4(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat2x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f16.wgsl.expected.glsl
index a845598..00faeb9 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f32.wgsl.expected.glsl
index 77ddbcb..bb55f22 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f16.wgsl.expected.glsl
index 8432487..d2d7047 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl
index a5f5f57..ea06f98 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f16.wgsl.expected.glsl
index 8432487..d2d7047 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl
index a5f5f57..ea06f98 100644
--- a/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f16.wgsl.expected.glsl
index a845598..00faeb9 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f32.wgsl.expected.glsl
index 77ddbcb..bb55f22 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/abstract-float.wgsl.expected.glsl
index 036b3d6..4ff020a 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f16.wgsl.expected.glsl
index 8432487..d2d7047 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl
index a5f5f57..ea06f98 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/abstract-float.wgsl.expected.glsl
index 036b3d6..4ff020a 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f16.wgsl.expected.glsl
index 8432487..d2d7047 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl
index a5f5f57..ea06f98 100644
--- a/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/load/f16.wgsl.expected.glsl
index 55f7ed4..48a51bf 100644
--- a/test/tint/expressions/type_ctor/mat3x2/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/load/f32.wgsl.expected.glsl
index 368ede2..ec7d213 100644
--- a/test/tint/expressions/type_ctor/mat3x2/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/zero/f16.wgsl.expected.glsl
index 829c598..37561ad 100644
--- a/test/tint/expressions/type_ctor/mat3x2/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x2 m = f16mat3x2(f16vec2(0.0hf), f16vec2(0.0hf), f16vec2(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x2/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x2/zero/f32.wgsl.expected.glsl
index 477c223..a5c3052 100644
--- a/test/tint/expressions/type_ctor/mat3x2/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x2/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x2 m = mat3x2(vec2(0.0f), vec2(0.0f), vec2(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f16.wgsl.expected.glsl
index b118b17..5566e4c 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f32.wgsl.expected.glsl
index 0d5aa0b..7aa3ad3 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f16.wgsl.expected.glsl
index 7947269..069fd8e 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl
index c03d326..8ad56d6 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f16.wgsl.expected.glsl
index 7947269..069fd8e 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl
index c03d326..8ad56d6 100644
--- a/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f16.wgsl.expected.glsl
index b118b17..5566e4c 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f32.wgsl.expected.glsl
index 0d5aa0b..7aa3ad3 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/abstract-float.wgsl.expected.glsl
index 96b2f23..1603855 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f16.wgsl.expected.glsl
index 7947269..069fd8e 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl
index c03d326..8ad56d6 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/abstract-float.wgsl.expected.glsl
index 96b2f23..1603855 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f16.wgsl.expected.glsl
index 7947269..069fd8e 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl
index c03d326..8ad56d6 100644
--- a/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/load/f16.wgsl.expected.glsl
index 0e04ddf..937b7d5 100644
--- a/test/tint/expressions/type_ctor/mat3x3/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/load/f32.wgsl.expected.glsl
index 348a4ff..373ede2 100644
--- a/test/tint/expressions/type_ctor/mat3x3/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/zero/f16.wgsl.expected.glsl
index 5a3abef..7b32ef1 100644
--- a/test/tint/expressions/type_ctor/mat3x3/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3 m = f16mat3(f16vec3(0.0hf), f16vec3(0.0hf), f16vec3(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x3/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x3/zero/f32.wgsl.expected.glsl
index 36b9edf..b81eabb 100644
--- a/test/tint/expressions/type_ctor/mat3x3/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x3/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3 m = mat3(vec3(0.0f), vec3(0.0f), vec3(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3 inner;
 } v;
 void tint_store_and_preserve_padding(mat3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f16.wgsl.expected.glsl
index 9863dbc..1ab5de4 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f32.wgsl.expected.glsl
index 2de36b1..e0aa7c1 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f16.wgsl.expected.glsl
index 2ba82bf..2c1ce8c 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl
index 6a23fdd..a6315b9 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f16.wgsl.expected.glsl
index 2ba82bf..2c1ce8c 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl
index 6a23fdd..a6315b9 100644
--- a/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f16.wgsl.expected.glsl
index 9863dbc..1ab5de4 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f32.wgsl.expected.glsl
index 2de36b1..e0aa7c1 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/abstract-float.wgsl.expected.glsl
index 9c45d48..5c14bda 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f16.wgsl.expected.glsl
index 2ba82bf..2c1ce8c 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl
index 6a23fdd..a6315b9 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/abstract-float.wgsl.expected.glsl
index 9c45d48..5c14bda 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f16.wgsl.expected.glsl
index 2ba82bf..2c1ce8c 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl
index 6a23fdd..a6315b9 100644
--- a/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/load/f16.wgsl.expected.glsl
index a9a891b..3542867 100644
--- a/test/tint/expressions/type_ctor/mat3x4/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/load/f32.wgsl.expected.glsl
index 23dd0f0..e327449 100644
--- a/test/tint/expressions/type_ctor/mat3x4/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/zero/f16.wgsl.expected.glsl
index edd61db..d0ed058 100644
--- a/test/tint/expressions/type_ctor/mat3x4/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat3x4 m = f16mat3x4(f16vec4(0.0hf), f16vec4(0.0hf), f16vec4(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat3x4/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat3x4/zero/f32.wgsl.expected.glsl
index eeed519..ac4e8f1 100644
--- a/test/tint/expressions/type_ctor/mat3x4/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat3x4/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat3x4 m = mat3x4(vec4(0.0f), vec4(0.0f), vec4(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat3x4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f16.wgsl.expected.glsl
index 3159fed..3c036d6 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f32.wgsl.expected.glsl
index 6229e69..d1c470a 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f16.wgsl.expected.glsl
index efc4ec3..7ebcde7 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl
index 592aee3..2ac1501 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f16.wgsl.expected.glsl
index efc4ec3..7ebcde7 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl
index 592aee3..2ac1501 100644
--- a/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f16.wgsl.expected.glsl
index 3159fed..3c036d6 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f32.wgsl.expected.glsl
index 6229e69..d1c470a 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/abstract-float.wgsl.expected.glsl
index 4c78fec..d62c055 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f16.wgsl.expected.glsl
index efc4ec3..7ebcde7 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl
index 592aee3..2ac1501 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/abstract-float.wgsl.expected.glsl
index 4c78fec..d62c055 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f16.wgsl.expected.glsl
index efc4ec3..7ebcde7 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf, 1.0hf), f16vec2(2.0hf, 3.0hf), f16vec2(4.0hf, 5.0hf), f16vec2(6.0hf, 7.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl
index 592aee3..2ac1501 100644
--- a/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/load/f16.wgsl.expected.glsl
index 169120a..4038a59 100644
--- a/test/tint/expressions/type_ctor/mat4x2/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/load/f32.wgsl.expected.glsl
index c38e784..893a952 100644
--- a/test/tint/expressions/type_ctor/mat4x2/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/zero/f16.wgsl.expected.glsl
index cc477a8..c4b19db 100644
--- a/test/tint/expressions/type_ctor/mat4x2/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x2 m = f16mat4x2(f16vec2(0.0hf), f16vec2(0.0hf), f16vec2(0.0hf), f16vec2(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x2/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x2/zero/f32.wgsl.expected.glsl
index 303be9f..757a694 100644
--- a/test/tint/expressions/type_ctor/mat4x2/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x2/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x2 m = mat4x2(vec2(0.0f), vec2(0.0f), vec2(0.0f), vec2(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x2 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f16.wgsl.expected.glsl
index fd0d118..3b9549c 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f32.wgsl.expected.glsl
index 7beb3b8..998494e 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f16.wgsl.expected.glsl
index 45af429..61eb1a4 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl
index 2e921ef..a1b7dfb 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f16.wgsl.expected.glsl
index 45af429..61eb1a4 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl
index 2e921ef..a1b7dfb 100644
--- a/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f16.wgsl.expected.glsl
index fd0d118..3b9549c 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f32.wgsl.expected.glsl
index 7beb3b8..998494e 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/abstract-float.wgsl.expected.glsl
index 7f9a1ba..275a5e8 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f16.wgsl.expected.glsl
index 45af429..61eb1a4 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl
index 2e921ef..a1b7dfb 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/abstract-float.wgsl.expected.glsl
index 7f9a1ba..275a5e8 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f16.wgsl.expected.glsl
index 45af429..61eb1a4 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf, 1.0hf, 2.0hf), f16vec3(3.0hf, 4.0hf, 5.0hf), f16vec3(6.0hf, 7.0hf, 8.0hf), f16vec3(9.0hf, 10.0hf, 11.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl
index 2e921ef..a1b7dfb 100644
--- a/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/load/f16.wgsl.expected.glsl
index 32c8241..e3db7a4 100644
--- a/test/tint/expressions/type_ctor/mat4x3/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/load/f32.wgsl.expected.glsl
index 6afb390..86776cd 100644
--- a/test/tint/expressions/type_ctor/mat4x3/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/zero/f16.wgsl.expected.glsl
index 8b9f710..575ef44 100644
--- a/test/tint/expressions/type_ctor/mat4x3/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4x3 m = f16mat4x3(f16vec3(0.0hf), f16vec3(0.0hf), f16vec3(0.0hf), f16vec3(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(f16mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x3/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x3/zero/f32.wgsl.expected.glsl
index 96cf742..d6ad8a8 100644
--- a/test/tint/expressions/type_ctor/mat4x3/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x3/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4x3 m = mat4x3(vec3(0.0f), vec3(0.0f), vec3(0.0f), vec3(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4x3 inner;
 } v;
 void tint_store_and_preserve_padding(mat4x3 value_param) {
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f16.wgsl.expected.glsl
index d2219bd..675c86f 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f32.wgsl.expected.glsl
index dbeb07b3..13c43ef 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f16.wgsl.expected.glsl
index 654775e..686fac0 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl
index a567b39..47e7379 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f16.wgsl.expected.glsl
index 654775e..686fac0 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl
index a567b39..47e7379 100644
--- a/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f16.wgsl.expected.glsl
index d2219bd..675c86f 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f32.wgsl.expected.glsl
index dbeb07b3..13c43ef 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/identity/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/abstract-float.wgsl.expected.glsl
index 2e3137d..c3980fc 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f16.wgsl.expected.glsl
index 654775e..686fac0 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl
index a567b39..47e7379 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/abstract-float.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/abstract-float.wgsl.expected.glsl
index 2e3137d..c3980fc 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/abstract-float.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/abstract-float.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f16.wgsl.expected.glsl
index 654775e..686fac0 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf, 1.0hf, 2.0hf, 3.0hf), f16vec4(4.0hf, 5.0hf, 6.0hf, 7.0hf), f16vec4(8.0hf, 9.0hf, 10.0hf, 11.0hf), f16vec4(12.0hf, 13.0hf, 14.0hf, 15.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl
index a567b39..47e7379 100644
--- a/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/load/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/load/f16.wgsl.expected.glsl
index f22dd3a..f8ef3bf 100644
--- a/test/tint/expressions/type_ctor/mat4x4/load/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/load/f16.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 #extension GL_AMD_gpu_shader_half_float: require
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/load/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/load/f32.wgsl.expected.glsl
index eb47813..316186e 100644
--- a/test/tint/expressions/type_ctor/mat4x4/load/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/load/f32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/zero/f16.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/zero/f16.wgsl.expected.glsl
index 9103ef1..5a21c7b 100644
--- a/test/tint/expressions/type_ctor/mat4x4/zero/f16.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/zero/f16.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 
 f16mat4 m = f16mat4(f16vec4(0.0hf), f16vec4(0.0hf), f16vec4(0.0hf), f16vec4(0.0hf));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   f16mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/expressions/type_ctor/mat4x4/zero/f32.wgsl.expected.glsl b/test/tint/expressions/type_ctor/mat4x4/zero/f32.wgsl.expected.glsl
index cc9b6e3..c0f96bc 100644
--- a/test/tint/expressions/type_ctor/mat4x4/zero/f32.wgsl.expected.glsl
+++ b/test/tint/expressions/type_ctor/mat4x4/zero/f32.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 mat4 m = mat4(vec4(0.0f), vec4(0.0f), vec4(0.0f), vec4(0.0f));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   mat4 inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.glsl b/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.glsl
index f9f3843..7b3d3eb 100644
--- a/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.glsl
+++ b/test/tint/extensions/dual_source_blending/input_output.wgsl.expected.glsl
@@ -18,14 +18,14 @@
 layout(location = 1) in vec4 tint_interstage_location1;
 layout(location = 0, index = 0) out vec4 frag_main_loc0_idx0_Output;
 layout(location = 0, index = 1) out vec4 frag_main_loc0_idx1_Output;
-FragOutput frag_main_inner(FragInput tint_symbol) {
-  FragOutput tint_symbol_1 = FragOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol_1.color = tint_symbol.a;
-  tint_symbol_1.blend = tint_symbol.b;
-  return tint_symbol_1;
+FragOutput frag_main_inner(FragInput v) {
+  FragOutput v_1 = FragOutput(vec4(0.0f), vec4(0.0f));
+  v_1.color = v.a;
+  v_1.blend = v.b;
+  return v_1;
 }
 void main() {
-  FragOutput v = frag_main_inner(FragInput(tint_interstage_location0, tint_interstage_location1));
-  frag_main_loc0_idx0_Output = v.color;
-  frag_main_loc0_idx1_Output = v.blend;
+  FragOutput v_2 = frag_main_inner(FragInput(tint_interstage_location0, tint_interstage_location1));
+  frag_main_loc0_idx0_Output = v_2.color;
+  frag_main_loc0_idx1_Output = v_2.blend;
 }
diff --git a/test/tint/extensions/dual_source_blending/output.wgsl.expected.glsl b/test/tint/extensions/dual_source_blending/output.wgsl.expected.glsl
index 3fcfa92c8..e2867fb 100644
--- a/test/tint/extensions/dual_source_blending/output.wgsl.expected.glsl
+++ b/test/tint/extensions/dual_source_blending/output.wgsl.expected.glsl
@@ -12,13 +12,13 @@
 layout(location = 0, index = 0) out vec4 frag_main_loc0_idx0_Output;
 layout(location = 0, index = 1) out vec4 frag_main_loc0_idx1_Output;
 FragOutput frag_main_inner() {
-  FragOutput tint_symbol = FragOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol.color = vec4(0.5f, 0.5f, 0.5f, 1.0f);
-  tint_symbol.blend = vec4(0.5f, 0.5f, 0.5f, 1.0f);
-  return tint_symbol;
+  FragOutput v = FragOutput(vec4(0.0f), vec4(0.0f));
+  v.color = vec4(0.5f, 0.5f, 0.5f, 1.0f);
+  v.blend = vec4(0.5f, 0.5f, 0.5f, 1.0f);
+  return v;
 }
 void main() {
-  FragOutput v = frag_main_inner();
-  frag_main_loc0_idx0_Output = v.color;
-  frag_main_loc0_idx1_Output = v.blend;
+  FragOutput v_1 = frag_main_inner();
+  frag_main_loc0_idx0_Output = v_1.color;
+  frag_main_loc0_idx1_Output = v_1.blend;
 }
diff --git a/test/tint/extensions/parsing/basic.wgsl.expected.glsl b/test/tint/extensions/parsing/basic.wgsl.expected.glsl
index a6f9d72..c309682 100644
--- a/test/tint/extensions/parsing/basic.wgsl.expected.glsl
+++ b/test/tint/extensions/parsing/basic.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.10000000149011611938f, 0.20000000298023223877f, 0.30000001192092895508f, 0.40000000596046447754f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/extensions/parsing/duplicated_extensions.wgsl.expected.glsl b/test/tint/extensions/parsing/duplicated_extensions.wgsl.expected.glsl
index a6f9d72..c309682 100644
--- a/test/tint/extensions/parsing/duplicated_extensions.wgsl.expected.glsl
+++ b/test/tint/extensions/parsing/duplicated_extensions.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.10000000149011611938f, 0.20000000298023223877f, 0.30000001192092895508f, 0.40000000596046447754f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/extensions/parsing/multiple.wgsl.expected.glsl b/test/tint/extensions/parsing/multiple.wgsl.expected.glsl
index a6f9d72..c309682 100644
--- a/test/tint/extensions/parsing/multiple.wgsl.expected.glsl
+++ b/test/tint/extensions/parsing/multiple.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.10000000149011611938f, 0.20000000298023223877f, 0.30000001192092895508f, 0.40000000596046447754f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/extensions/texel_fetch/additional_params/a.wgsl.expected.glsl b/test/tint/extensions/texel_fetch/additional_params/a.wgsl.expected.glsl
index 9dd6d37..dbcb1cf 100644
--- a/test/tint/extensions/texel_fetch/additional_params/a.wgsl.expected.glsl
+++ b/test/tint/extensions/texel_fetch/additional_params/a.wgsl.expected.glsl
@@ -11,11 +11,11 @@
 layout(location = 0) in vec4 tint_interstage_location0;
 void g(float a, float b, float c) {
 }
-void f_inner(vec4 pos, vec4 fbf, In tint_symbol) {
-  g(pos.x, fbf.x, tint_symbol.uv.x);
+void f_inner(vec4 pos, vec4 fbf, In v) {
+  g(pos.x, fbf.x, v.uv.x);
 }
 void main() {
-  vec4 v = gl_FragCoord;
-  vec4 v_1 = f_Input;
-  f_inner(v, v_1, In(tint_interstage_location0));
+  vec4 v_1 = gl_FragCoord;
+  vec4 v_2 = f_Input;
+  f_inner(v_1, v_2, In(tint_interstage_location0));
 }
diff --git a/test/tint/extensions/texel_fetch/additional_params/c.wgsl.expected.glsl b/test/tint/extensions/texel_fetch/additional_params/c.wgsl.expected.glsl
index cf6fee1..8345537 100644
--- a/test/tint/extensions/texel_fetch/additional_params/c.wgsl.expected.glsl
+++ b/test/tint/extensions/texel_fetch/additional_params/c.wgsl.expected.glsl
@@ -13,8 +13,8 @@
 in vec4 f_Input;
 void g(float a, float b, float c) {
 }
-void f_inner(In tint_symbol) {
-  g(tint_symbol.pos.x, tint_symbol.uv.x, tint_symbol.fbf.y);
+void f_inner(In v) {
+  g(v.pos.x, v.uv.x, v.fbf.y);
 }
 void main() {
   f_inner(In(gl_FragCoord, tint_interstage_location0, f_Input));
diff --git a/test/tint/extensions/texel_fetch/additional_params/f.wgsl.expected.glsl b/test/tint/extensions/texel_fetch/additional_params/f.wgsl.expected.glsl
index 4e2376f..f610018 100644
--- a/test/tint/extensions/texel_fetch/additional_params/f.wgsl.expected.glsl
+++ b/test/tint/extensions/texel_fetch/additional_params/f.wgsl.expected.glsl
@@ -10,10 +10,10 @@
 in vec4 f_Input;
 void g(float a, float b) {
 }
-void f_inner(In tint_symbol, vec4 fbf) {
-  g(tint_symbol.pos.x, fbf.y);
+void f_inner(In v, vec4 fbf) {
+  g(v.pos.x, fbf.y);
 }
 void main() {
-  In v = In(gl_FragCoord);
-  f_inner(v, f_Input);
+  In v_1 = In(gl_FragCoord);
+  f_inner(v_1, f_Input);
 }
diff --git a/test/tint/identifiers/underscore/double/fn.wgsl.expected.glsl b/test/tint/identifiers/underscore/double/fn.wgsl.expected.glsl
index 47c05be..e4345ee 100644
--- a/test/tint/identifiers/underscore/double/fn.wgsl.expected.glsl
+++ b/test/tint/identifiers/underscore/double/fn.wgsl.expected.glsl
@@ -2,16 +2,16 @@
 
 void a() {
 }
-void tint_symbol() {
+void v() {
 }
 void b() {
   a();
 }
-void tint_symbol_1() {
-  tint_symbol();
+void v_1() {
+  v();
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   b();
-  tint_symbol_1();
+  v_1();
 }
diff --git a/test/tint/identifiers/underscore/double/let.wgsl.expected.glsl b/test/tint/identifiers/underscore/double/let.wgsl.expected.glsl
index f9bd4ac..eea1104 100644
--- a/test/tint/identifiers/underscore/double/let.wgsl.expected.glsl
+++ b/test/tint/identifiers/underscore/double/let.wgsl.expected.glsl
@@ -7,8 +7,8 @@
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   int a = 1;
-  int tint_symbol = a;
+  int v_1 = a;
   int b = a;
-  int tint_symbol_1 = tint_symbol;
-  v.inner = (((a + tint_symbol) + b) + tint_symbol_1);
+  int v_2 = v_1;
+  v.inner = (((a + v_1) + b) + v_2);
 }
diff --git a/test/tint/identifiers/underscore/double/parameter.wgsl.expected.glsl b/test/tint/identifiers/underscore/double/parameter.wgsl.expected.glsl
index dbe85ea..0a7819c 100644
--- a/test/tint/identifiers/underscore/double/parameter.wgsl.expected.glsl
+++ b/test/tint/identifiers/underscore/double/parameter.wgsl.expected.glsl
@@ -4,8 +4,8 @@
 buffer s_block_1_ssbo {
   int inner;
 } v;
-void f(int tint_symbol) {
-  int b = tint_symbol;
+void f(int v_1) {
+  int b = v_1;
   v.inner = b;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/identifiers/underscore/double/struct.wgsl.expected.glsl b/test/tint/identifiers/underscore/double/struct.wgsl.expected.glsl
index bc6074b..f3c5029 100644
--- a/test/tint/identifiers/underscore/double/struct.wgsl.expected.glsl
+++ b/test/tint/identifiers/underscore/double/struct.wgsl.expected.glsl
@@ -1,8 +1,8 @@
 #version 310 es
 
 
-struct tint_symbol {
-  int tint_symbol_1;
+struct tint_struct {
+  int member_0;
 };
 
 layout(binding = 0, std430)
@@ -11,7 +11,7 @@
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol c = tint_symbol(0);
-  int d = c.tint_symbol_1;
-  v.inner = (c.tint_symbol_1 + d);
+  tint_struct c = tint_struct(0);
+  int d = c.member_0;
+  v.inner = (c.member_0 + d);
 }
diff --git a/test/tint/identifiers/underscore/double/var.wgsl.expected.glsl b/test/tint/identifiers/underscore/double/var.wgsl.expected.glsl
index 0a79fd1..56b0f56 100644
--- a/test/tint/identifiers/underscore/double/var.wgsl.expected.glsl
+++ b/test/tint/identifiers/underscore/double/var.wgsl.expected.glsl
@@ -5,10 +5,10 @@
   int inner;
 } v;
 int a = 1;
-int tint_symbol = 2;
+int v_1 = 2;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
   int b = a;
-  int tint_symbol_1 = tint_symbol;
-  v.inner = (b + tint_symbol_1);
+  int v_2 = v_1;
+  v.inner = (b + v_2);
 }
diff --git a/test/tint/let/inferred/function.wgsl.expected.glsl b/test/tint/let/inferred/function.wgsl.expected.glsl
index dec2b19..ef11109 100644
--- a/test/tint/let/inferred/function.wgsl.expected.glsl
+++ b/test/tint/let/inferred/function.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl b/test/tint/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl
index bc254a5..47ee968 100644
--- a/test/tint/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int i;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     i = 0;
   }
@@ -11,5 +11,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.glsl
index 2769624..86be61c 100644
--- a/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/array_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 int[4] func() {
   return S.arr;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v = 0u;
     v = tint_local_index;
@@ -30,5 +30,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/i32.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/i32.wgsl.expected.glsl
index f31ff43..ee283bb 100644
--- a/test/tint/ptr_ref/load/param/workgroup/i32.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/i32.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 int func() {
   return S;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = 0;
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.glsl
index f0a2bcb..9d7abed 100644
--- a/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/i32_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 int func() {
   return S.i;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = str(0);
   }
@@ -18,5 +18,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.glsl
index 1af54ba..d94385d 100644
--- a/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/struct_in_array.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 str func(uint pointer_indices[1]) {
   return S[pointer_indices[0u]];
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v = 0u;
     v = tint_local_index;
@@ -30,5 +30,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
index 1373abe..65d884e 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 vec2 func(uint pointer_indices[1]) {
   return S[pointer_indices[0u]];
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = mat2(vec2(0.0f), vec2(0.0f));
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec4_f32.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/vec4_f32.wgsl.expected.glsl
index 49456d7..b5c0155 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec4_f32.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/vec4_f32.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 vec4 func() {
   return S;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = vec4(0.0f);
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
index 387ca98..26243ce 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 vec4 func(uint pointer_indices[1]) {
   return S[pointer_indices[0u]];
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = mat2x4(vec4(0.0f), vec4(0.0f));
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
index 7408133..4c524d3 100644
--- a/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/load/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 vec4 func() {
   return S.i;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = str(vec4(0.0f));
   }
@@ -18,5 +18,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.glsl
index 89422a5..6a3b1e1 100644
--- a/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/array_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 void func() {
   S.arr = int[4](0, 0, 0, 0);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v = 0u;
     v = tint_local_index;
@@ -30,5 +30,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/i32.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/i32.wgsl.expected.glsl
index efd4100..5ff408a 100644
--- a/test/tint/ptr_ref/store/param/workgroup/i32.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/i32.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 void func() {
   S = 42;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = 0;
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.glsl
index 8b06408..2a22d49 100644
--- a/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/i32_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 void func() {
   S.i = 42;
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = str(0);
   }
@@ -18,5 +18,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.glsl
index 0f7d093..a8f4c6d 100644
--- a/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/struct_in_array.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 void func(uint pointer_indices[1]) {
   S[pointer_indices[0u]] = str(0);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v = 0u;
     v = tint_local_index;
@@ -30,5 +30,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
index 41f4ee4..f3f3778 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/vec2_f32_in_mat2x2.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 void func(uint pointer_indices[1]) {
   S[pointer_indices[0u]] = vec2(0.0f);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = mat2(vec2(0.0f), vec2(0.0f));
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec4_f32.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/vec4_f32.wgsl.expected.glsl
index 6b7fb3b..e4cf405 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec4_f32.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/vec4_f32.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 void func() {
   S = vec4(0.0f);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = vec4(0.0f);
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
index 4626d3f..b110f92 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_mat2x4.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 void func(uint pointer_indices[1]) {
   S[pointer_indices[0u]] = vec4(0.0f);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = mat2x4(vec4(0.0f), vec4(0.0f));
   }
@@ -13,5 +13,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
index 6e320ba..299d3d0 100644
--- a/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_ref/store/param/workgroup/vec4_f32_in_struct.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 void func() {
   S.i = vec4(0.0f);
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     S = str(vec4(0.0f));
   }
@@ -18,5 +18,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/ptr_sugar/builtin_struct.wgsl.expected.glsl b/test/tint/ptr_sugar/builtin_struct.wgsl.expected.glsl
index 08eb09c..a8a333c 100644
--- a/test/tint/ptr_sugar/builtin_struct.wgsl.expected.glsl
+++ b/test/tint/ptr_sugar/builtin_struct.wgsl.expected.glsl
@@ -2,34 +2,34 @@
 
 
 struct modf_result_f32 {
-  float fract;
+  float member_0;
   float whole;
 };
 
 struct frexp_result_f32 {
-  float fract;
-  int exp;
+  float member_0;
+  int member_1;
 };
 
 void deref_modf() {
   modf_result_f32 a = modf_result_f32(0.5f, 1.0f);
-  float tint_symbol = a.fract;
+  float v = a.member_0;
   float whole = a.whole;
 }
 void no_deref_modf() {
   modf_result_f32 a = modf_result_f32(0.5f, 1.0f);
-  float tint_symbol = a.fract;
+  float v_1 = a.member_0;
   float whole = a.whole;
 }
 void deref_frexp() {
   frexp_result_f32 a = frexp_result_f32(0.75f, 1);
-  float tint_symbol = a.fract;
-  int tint_symbol_1 = a.exp;
+  float v_2 = a.member_0;
+  int v_3 = a.member_1;
 }
 void no_deref_frexp() {
   frexp_result_f32 a = frexp_result_f32(0.75f, 1);
-  float tint_symbol = a.fract;
-  int tint_symbol_1 = a.exp;
+  float v_4 = a.member_0;
+  int v_5 = a.member_1;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/ptr_sugar/vector_swizzle.wgsl.expected.glsl b/test/tint/ptr_sugar/vector_swizzle.wgsl.expected.glsl
index ced6b80..052878a 100644
--- a/test/tint/ptr_sugar/vector_swizzle.wgsl.expected.glsl
+++ b/test/tint/ptr_sugar/vector_swizzle.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   ivec4 inner;
 } v;
 void deref() {
diff --git a/test/tint/samples/compute_boids.wgsl.expected.glsl b/test/tint/samples/compute_boids.wgsl.expected.glsl
index a5ea2ac..7189056 100644
--- a/test/tint/samples/compute_boids.wgsl.expected.glsl
+++ b/test/tint/samples/compute_boids.wgsl.expected.glsl
@@ -68,15 +68,15 @@
 buffer particlesB_block_1_ssbo {
   Particles inner;
 } v_2;
-void comp_main_inner(uvec3 tint_symbol) {
-  uint index = tint_symbol.x;
+void comp_main_inner(uvec3 v_3) {
+  uint index = v_3.x;
   if ((index >= 5u)) {
     return;
   }
-  uint v_3 = min(index, 4u);
-  vec2 vPos = v_1.inner.particles[v_3].pos;
   uint v_4 = min(index, 4u);
-  vec2 vVel = v_1.inner.particles[v_4].vel;
+  vec2 vPos = v_1.inner.particles[v_4].pos;
+  uint v_5 = min(index, 4u);
+  vec2 vVel = v_1.inner.particles[v_5].vel;
   vec2 cMass = vec2(0.0f);
   vec2 cVel = vec2(0.0f);
   vec2 colVel = vec2(0.0f);
@@ -97,10 +97,10 @@
         }
         continue;
       }
-      uint v_5 = min(i, 4u);
-      pos = v_1.inner.particles[v_5].pos.xy;
       uint v_6 = min(i, 4u);
-      vel = v_1.inner.particles[v_6].vel.xy;
+      pos = v_1.inner.particles[v_6].pos.xy;
+      uint v_7 = min(i, 4u);
+      vel = v_1.inner.particles[v_7].vel.xy;
       if ((distance(pos, vPos) < v.inner.rule1Distance)) {
         cMass = (cMass + pos);
         cMassCount = (cMassCount + 1);
@@ -119,15 +119,15 @@
     }
   }
   if ((cMassCount > 0)) {
-    vec2 v_7 = cMass;
-    float v_8 = float(cMassCount);
-    vec2 v_9 = (v_7 / vec2(v_8, float(cMassCount)));
-    cMass = (v_9 - vPos);
+    vec2 v_8 = cMass;
+    float v_9 = float(cMassCount);
+    vec2 v_10 = (v_8 / vec2(v_9, float(cMassCount)));
+    cMass = (v_10 - vPos);
   }
   if ((cVelCount > 0)) {
-    vec2 v_10 = cVel;
-    float v_11 = float(cVelCount);
-    cVel = (v_10 / vec2(v_11, float(cVelCount)));
+    vec2 v_11 = cVel;
+    float v_12 = float(cVelCount);
+    cVel = (v_11 / vec2(v_12, float(cVelCount)));
   }
   vVel = (((vVel + (cMass * v.inner.rule1Scale)) + (colVel * v.inner.rule2Scale)) + (cVel * v.inner.rule3Scale));
   vVel = (normalize(vVel) * clamp(length(vVel), 0.0f, 0.10000000149011611938f));
@@ -144,10 +144,10 @@
   if ((vPos.y > 1.0f)) {
     vPos.y = -1.0f;
   }
-  uint v_12 = min(index, 4u);
-  v_2.inner.particles[v_12].pos = vPos;
   uint v_13 = min(index, 4u);
-  v_2.inner.particles[v_13].vel = vVel;
+  v_2.inner.particles[v_13].pos = vPos;
+  uint v_14 = min(index, 4u);
+  v_2.inner.particles[v_14].vel = vVel;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/samples/cube.wgsl.expected.glsl b/test/tint/samples/cube.wgsl.expected.glsl
index e6242b2..8cb2994 100644
--- a/test/tint/samples/cube.wgsl.expected.glsl
+++ b/test/tint/samples/cube.wgsl.expected.glsl
@@ -25,16 +25,16 @@
 layout(location = 0) in vec4 vtx_main_loc0_Input;
 layout(location = 1) in vec4 vtx_main_loc1_Input;
 layout(location = 0) out vec4 tint_interstage_location0;
-VertexOutput vtx_main_inner(VertexInput tint_symbol) {
-  VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f), vec4(0.0f));
-  tint_symbol_1.Position = (v.inner.modelViewProjectionMatrix * tint_symbol.cur_position);
-  tint_symbol_1.vtxFragColor = tint_symbol.color;
-  return tint_symbol_1;
+VertexOutput vtx_main_inner(VertexInput v_1) {
+  VertexOutput v_2 = VertexOutput(vec4(0.0f), vec4(0.0f));
+  v_2.Position = (v.inner.modelViewProjectionMatrix * v_1.cur_position);
+  v_2.vtxFragColor = v_1.color;
+  return v_2;
 }
 void main() {
-  VertexOutput v_1 = vtx_main_inner(VertexInput(vtx_main_loc0_Input, vtx_main_loc1_Input));
-  tint_interstage_location0 = v_1.vtxFragColor;
-  gl_Position = v_1.Position;
+  VertexOutput v_3 = vtx_main_inner(VertexInput(vtx_main_loc0_Input, vtx_main_loc1_Input));
+  tint_interstage_location0 = v_3.vtxFragColor;
+  gl_Position = v_3.Position;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/samples/function.wgsl.expected.glsl b/test/tint/samples/function.wgsl.expected.glsl
index 33c0cff..6838bfb 100644
--- a/test/tint/samples/function.wgsl.expected.glsl
+++ b/test/tint/samples/function.wgsl.expected.glsl
@@ -1,9 +1,9 @@
 #version 310 es
 
-float tint_symbol() {
+float v() {
   return 0.40000000596046447754f;
 }
 layout(local_size_x = 2, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  float a = tint_symbol();
+  float a = v();
 }
diff --git a/test/tint/samples/simple.wgsl.expected.glsl b/test/tint/samples/simple.wgsl.expected.glsl
index be52e66..0730976 100644
--- a/test/tint/samples/simple.wgsl.expected.glsl
+++ b/test/tint/samples/simple.wgsl.expected.glsl
@@ -2,14 +2,14 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
+layout(location = 0) out vec4 main_loc0_Output;
 void bar() {
 }
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   vec2 a = vec2(0.0f);
   bar();
   return vec4(0.40000000596046447754f, 0.40000000596046447754f, 0.80000001192092895508f, 1.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/samples/simple_vertex.spvasm.expected.glsl b/test/tint/samples/simple_vertex.spvasm.expected.glsl
index 0fec855..644260b 100644
--- a/test/tint/samples/simple_vertex.spvasm.expected.glsl
+++ b/test/tint/samples/simple_vertex.spvasm.expected.glsl
@@ -2,19 +2,19 @@
 
 
 struct main_out {
-  vec4 tint_symbol;
+  vec4 member_0;
 };
 
-vec4 tint_symbol = vec4(0.0f);
+vec4 v = vec4(0.0f);
 void main_1() {
-  tint_symbol = vec4(0.0f);
+  v = vec4(0.0f);
 }
-main_out tint_symbol_1_inner() {
+main_out main_inner() {
   main_1();
-  return main_out(tint_symbol);
+  return main_out(v);
 }
 void main() {
-  gl_Position = tint_symbol_1_inner().tint_symbol;
+  gl_Position = main_inner().member_0;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/shadowing/loop.wgsl.expected.glsl b/test/tint/shadowing/loop.wgsl.expected.glsl
index a85f992..f0713cb 100644
--- a/test/tint/shadowing/loop.wgsl.expected.glsl
+++ b/test/tint/shadowing/loop.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer output_block_1_ssbo {
   int inner[10];
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/shadowing/short_names/renamer/function.wgsl.expected.glsl b/test/tint/shadowing/short_names/renamer/function.wgsl.expected.glsl
index 21850f0..6814ce4 100644
--- a/test/tint/shadowing/short_names/renamer/function.wgsl.expected.glsl
+++ b/test/tint/shadowing/short_names/renamer/function.wgsl.expected.glsl
@@ -1,19 +1,19 @@
 #version 310 es
 
-int tint_symbol() {
+int v() {
   return 0;
 }
-float tint_symbol_1(int tint_symbol_2) {
-  return float(tint_symbol_2);
+float v_1(int v_2) {
+  return float(v_2);
 }
-bool tint_symbol_3(float tint_symbol_4) {
-  return bool(tint_symbol_4);
+bool v_3(float v_4) {
+  return bool(v_4);
 }
-vec4 tint_symbol_5_inner(uint tint_symbol_6) {
-  return mix(vec4(0.0f), vec4(1.0f), bvec4(tint_symbol_3(tint_symbol_1(tint_symbol()))));
+vec4 v_5(uint v_6) {
+  return mix(vec4(0.0f), vec4(1.0f), bvec4(v_3(v_1(v()))));
 }
 void main() {
-  gl_Position = tint_symbol_5_inner(uint(gl_VertexID));
+  gl_Position = v_5(uint(gl_VertexID));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.glsl b/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.glsl
index 2c58efa..4ccd958 100644
--- a/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.glsl
+++ b/test/tint/shadowing/short_names/renamer/renamer.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
-vec4 tint_symbol_inner(uint tint_symbol_1) {
+vec4 v(uint v_1) {
   return vec4(0.0f, 0.0f, 0.0f, 1.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(uint(gl_VertexID));
+  gl_Position = v(uint(gl_VertexID));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.glsl b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.glsl
index 906d049..6a7fbb9 100644
--- a/test/tint/shadowing/short_names/renamer/type.wgsl.expected.glsl
+++ b/test/tint/shadowing/short_names/renamer/type.wgsl.expected.glsl
@@ -1,18 +1,18 @@
 #version 310 es
 
 
-struct tint_symbol {
-  int tint_symbol_1;
+struct tint_struct {
+  int member_0;
 };
 
-vec4 tint_symbol_4_inner(uint tint_symbol_5) {
-  tint_symbol tint_symbol_6 = tint_symbol(1);
-  float tint_symbol_7 = float(tint_symbol_6.tint_symbol_1);
-  bool tint_symbol_8 = bool(tint_symbol_7);
-  return mix(vec4(0.0f), vec4(1.0f), bvec4(tint_symbol_8));
+vec4 v(uint v_1) {
+  tint_struct v_2 = tint_struct(1);
+  float v_3 = float(v_2.member_0);
+  bool v_4 = bool(v_3);
+  return mix(vec4(0.0f), vec4(1.0f), bvec4(v_4));
 }
 void main() {
-  gl_Position = tint_symbol_4_inner(uint(gl_VertexID));
+  gl_Position = v(uint(gl_VertexID));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.glsl b/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.glsl
index edab938..7a6a72a 100644
--- a/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.glsl
+++ b/test/tint/statements/compound_assign/complex_lhs.wgsl.expected.glsl
@@ -14,12 +14,12 @@
   counter = (counter + 2);
   return counter;
 }
-void tint_symbol() {
+void v() {
   S x = S(ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0)));
-  uint v = min(uint(foo()), 3u);
-  int v_1 = bar();
-  int v_2 = (x.a[v][min(uint(v_1), 3u)] + 5);
-  x.a[v][min(uint(v_1), 3u)] = v_2;
+  uint v_1 = min(uint(foo()), 3u);
+  int v_2 = bar();
+  int v_3 = (x.a[v_1][min(uint(v_2), 3u)] + 5);
+  x.a[v_1][min(uint(v_2), 3u)] = v_3;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/statements/decrement/array_element.wgsl.expected.glsl b/test/tint/statements/decrement/array_element.wgsl.expected.glsl
index 246f5ce..f5fff48 100644
--- a/test/tint/statements/decrement/array_element.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/array_element.wgsl.expected.glsl
@@ -4,10 +4,10 @@
 buffer a_block_1_ssbo {
   uint inner[];
 } v;
-void tint_symbol() {
-  uint v_1 = (uint(v.inner.length()) - 1u);
-  uint v_2 = min(uint(1), v_1);
-  v.inner[v_2] = (v.inner[v_2] - 1u);
+void v_1() {
+  uint v_2 = (uint(v.inner.length()) - 1u);
+  uint v_3 = min(uint(1), v_2);
+  v.inner[v_3] = (v.inner[v_3] - 1u);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/statements/decrement/complex.wgsl.expected.glsl b/test/tint/statements/decrement/complex.wgsl.expected.glsl
index 4a0ce3f..f407ebc 100644
--- a/test/tint/statements/decrement/complex.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/complex.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   S inner[];
 } v_1;
 uint v = 0u;
@@ -34,17 +34,17 @@
   v = (v - 1u);
   return 2;
 }
-void tint_symbol_1() {
+void v_2() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
-    int v_2 = idx1();
-    int v_3 = idx2();
-    uint v_4 = (uint(v_1.inner.length()) - 1u);
-    uint v_5 = min(uint(v_2), v_4);
-    uint v_6 = min(uint(v_3), 3u);
-    int v_7 = idx3();
-    int v_8 = (v_1.inner[v_5].a[v_6][min(uint(v_7), 3u)] - 1);
-    v_1.inner[v_5].a[v_6][min(uint(v_7), 3u)] = v_8;
+    int v_3 = idx1();
+    int v_4 = idx2();
+    uint v_5 = (uint(v_1.inner.length()) - 1u);
+    uint v_6 = min(uint(v_3), v_5);
+    uint v_7 = min(uint(v_4), 3u);
+    int v_8 = idx3();
+    int v_9 = (v_1.inner[v_6].a[v_7][min(uint(v_8), 3u)] - 1);
+    v_1.inner[v_6].a[v_7][min(uint(v_8), 3u)] = v_9;
     while(true) {
       if (all(equal(tint_loop_idx, uvec2(4294967295u)))) {
         break;
@@ -58,14 +58,14 @@
         tint_loop_idx.x = tint_low_inc;
         uint tint_carry = uint((tint_low_inc == 0u));
         tint_loop_idx.y = (tint_loop_idx.y + tint_carry);
-        int v_9 = idx4();
-        int v_10 = idx5();
-        uint v_11 = (uint(v_1.inner.length()) - 1u);
-        uint v_12 = min(uint(v_9), v_11);
-        uint v_13 = min(uint(v_10), 3u);
-        int v_14 = idx6();
-        int v_15 = (v_1.inner[v_12].a[v_13][min(uint(v_14), 3u)] - 1);
-        v_1.inner[v_12].a[v_13][min(uint(v_14), 3u)] = v_15;
+        int v_10 = idx4();
+        int v_11 = idx5();
+        uint v_12 = (uint(v_1.inner.length()) - 1u);
+        uint v_13 = min(uint(v_10), v_12);
+        uint v_14 = min(uint(v_11), 3u);
+        int v_15 = idx6();
+        int v_16 = (v_1.inner[v_13].a[v_14][min(uint(v_15), 3u)] - 1);
+        v_1.inner[v_13].a[v_14][min(uint(v_15), 3u)] = v_16;
       }
       continue;
     }
diff --git a/test/tint/statements/decrement/for_loop_continuing.wgsl.expected.glsl b/test/tint/statements/decrement/for_loop_continuing.wgsl.expected.glsl
index 87ca32e..5844e45 100644
--- a/test/tint/statements/decrement/for_loop_continuing.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/for_loop_continuing.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
diff --git a/test/tint/statements/decrement/for_loop_initializer.wgsl.expected.glsl b/test/tint/statements/decrement/for_loop_initializer.wgsl.expected.glsl
index 25888bc..f7945f7 100644
--- a/test/tint/statements/decrement/for_loop_initializer.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/for_loop_initializer.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     v.inner = (v.inner - 1u);
diff --git a/test/tint/statements/decrement/function.wgsl.expected.glsl b/test/tint/statements/decrement/function.wgsl.expected.glsl
index 5e2c4dc..743a65e 100644
--- a/test/tint/statements/decrement/function.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/function.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 #version 310 es
 
-void tint_symbol() {
+void v() {
   int i = 0;
   i = (i - 1);
 }
diff --git a/test/tint/statements/decrement/private.wgsl.expected.glsl b/test/tint/statements/decrement/private.wgsl.expected.glsl
index 3190b67..c7aa6e4 100644
--- a/test/tint/statements/decrement/private.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/private.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 int i = 0;
-void tint_symbol() {
+void v() {
   i = (i - 1);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/statements/decrement/split.wgsl.expected.glsl b/test/tint/statements/decrement/split.wgsl.expected.glsl
index 431b241..0318a6d 100644
--- a/test/tint/statements/decrement/split.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/split.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 #version 310 es
 
-void tint_symbol() {
+void v() {
   int b = 2;
   int c = (b - -(b));
 }
diff --git a/test/tint/statements/decrement/storage.wgsl.expected.glsl b/test/tint/statements/decrement/storage.wgsl.expected.glsl
index 87e94e5..a978788 100644
--- a/test/tint/statements/decrement/storage.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/storage.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   v.inner = (v.inner - 1u);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/statements/decrement/vector_component.wgsl.expected.glsl b/test/tint/statements/decrement/vector_component.wgsl.expected.glsl
index 25038e9..c537366 100644
--- a/test/tint/statements/decrement/vector_component.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/vector_component.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer a_block_1_ssbo {
   uvec4 inner;
 } v;
-void tint_symbol() {
+void v_1() {
   v.inner.y = (v.inner.y - 1u);
   v.inner.z = (v.inner.z - 1u);
 }
diff --git a/test/tint/statements/decrement/workgroup.wgsl.expected.glsl b/test/tint/statements/decrement/workgroup.wgsl.expected.glsl
index 5175407..91f4834 100644
--- a/test/tint/statements/decrement/workgroup.wgsl.expected.glsl
+++ b/test/tint/statements/decrement/workgroup.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int i;
-void tint_symbol() {
+void v() {
   i = (i - 1);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/statements/discard/atomic_in_for_loop_continuing.wgsl.expected.glsl b/test/tint/statements/discard/atomic_in_for_loop_continuing.wgsl.expected.glsl
index d206993..29e65b3 100644
--- a/test/tint/statements/discard/atomic_in_for_loop_continuing.wgsl.expected.glsl
+++ b/test/tint/statements/discard/atomic_in_for_loop_continuing.wgsl.expected.glsl
@@ -14,8 +14,8 @@
 int tint_f32_to_i32(float value) {
   return mix(2147483647, mix((-2147483647 - 1), int(value), (value >= -2147483648.0f)), (value <= 2147483520.0f));
 }
-int foo_inner(float tint_symbol, vec2 coord) {
-  if ((tint_symbol == 0.0f)) {
+int foo_inner(float v_1, vec2 coord) {
+  if ((v_1 == 0.0f)) {
     continue_execution = false;
   }
   int result = tint_f32_to_i32(texture(t_s, coord).x);
@@ -36,11 +36,11 @@
         tint_loop_idx.x = tint_low_inc;
         uint tint_carry = uint((tint_low_inc == 0u));
         tint_loop_idx.y = (tint_loop_idx.y + tint_carry);
-        int v_1 = 0;
+        int v_2 = 0;
         if (continue_execution) {
-          v_1 = atomicAdd(v.inner, 1);
+          v_2 = atomicAdd(v.inner, 1);
         }
-        i = v_1;
+        i = v_2;
       }
       continue;
     }
diff --git a/test/tint/statements/discard/helper_functions.wgsl.expected.glsl b/test/tint/statements/discard/helper_functions.wgsl.expected.glsl
index 687b831..88e2ebb 100644
--- a/test/tint/statements/discard/helper_functions.wgsl.expected.glsl
+++ b/test/tint/statements/discard/helper_functions.wgsl.expected.glsl
@@ -7,7 +7,7 @@
   int inner;
 } v;
 layout(binding = 1, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   float inner;
 } v_1;
 bool continue_execution = true;
diff --git a/test/tint/statements/discard/multiple_returns.wgsl.expected.glsl b/test/tint/statements/discard/multiple_returns.wgsl.expected.glsl
index ee6a329..66768bf 100644
--- a/test/tint/statements/discard/multiple_returns.wgsl.expected.glsl
+++ b/test/tint/statements/discard/multiple_returns.wgsl.expected.glsl
@@ -7,7 +7,7 @@
   int inner;
 } v;
 layout(binding = 1, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   float inner;
 } v_1;
 bool continue_execution = true;
diff --git a/test/tint/statements/discard/non_uniform.wgsl.expected.glsl b/test/tint/statements/discard/non_uniform.wgsl.expected.glsl
index 9530f1b..3dc35d6 100644
--- a/test/tint/statements/discard/non_uniform.wgsl.expected.glsl
+++ b/test/tint/statements/discard/non_uniform.wgsl.expected.glsl
@@ -7,7 +7,7 @@
   int inner;
 } v;
 layout(binding = 1, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   float inner;
 } v_1;
 bool continue_execution = true;
diff --git a/test/tint/statements/increment/array_element.wgsl.expected.glsl b/test/tint/statements/increment/array_element.wgsl.expected.glsl
index 0f81be8..73935c4 100644
--- a/test/tint/statements/increment/array_element.wgsl.expected.glsl
+++ b/test/tint/statements/increment/array_element.wgsl.expected.glsl
@@ -4,10 +4,10 @@
 buffer a_block_1_ssbo {
   uint inner[];
 } v;
-void tint_symbol() {
-  uint v_1 = (uint(v.inner.length()) - 1u);
-  uint v_2 = min(uint(1), v_1);
-  v.inner[v_2] = (v.inner[v_2] + 1u);
+void v_1() {
+  uint v_2 = (uint(v.inner.length()) - 1u);
+  uint v_3 = min(uint(1), v_2);
+  v.inner[v_3] = (v.inner[v_3] + 1u);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/statements/increment/complex.wgsl.expected.glsl b/test/tint/statements/increment/complex.wgsl.expected.glsl
index 4783fcb..de9bbfe 100644
--- a/test/tint/statements/increment/complex.wgsl.expected.glsl
+++ b/test/tint/statements/increment/complex.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer buffer_block_1_ssbo {
   S inner[];
 } v_1;
 uint v = 0u;
@@ -34,17 +34,17 @@
   v = (v + 1u);
   return 2;
 }
-void tint_symbol_1() {
+void v_2() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
-    int v_2 = idx1();
-    int v_3 = idx2();
-    uint v_4 = (uint(v_1.inner.length()) - 1u);
-    uint v_5 = min(uint(v_2), v_4);
-    uint v_6 = min(uint(v_3), 3u);
-    int v_7 = idx3();
-    int v_8 = (v_1.inner[v_5].a[v_6][min(uint(v_7), 3u)] + 1);
-    v_1.inner[v_5].a[v_6][min(uint(v_7), 3u)] = v_8;
+    int v_3 = idx1();
+    int v_4 = idx2();
+    uint v_5 = (uint(v_1.inner.length()) - 1u);
+    uint v_6 = min(uint(v_3), v_5);
+    uint v_7 = min(uint(v_4), 3u);
+    int v_8 = idx3();
+    int v_9 = (v_1.inner[v_6].a[v_7][min(uint(v_8), 3u)] + 1);
+    v_1.inner[v_6].a[v_7][min(uint(v_8), 3u)] = v_9;
     while(true) {
       if (all(equal(tint_loop_idx, uvec2(4294967295u)))) {
         break;
@@ -58,14 +58,14 @@
         tint_loop_idx.x = tint_low_inc;
         uint tint_carry = uint((tint_low_inc == 0u));
         tint_loop_idx.y = (tint_loop_idx.y + tint_carry);
-        int v_9 = idx4();
-        int v_10 = idx5();
-        uint v_11 = (uint(v_1.inner.length()) - 1u);
-        uint v_12 = min(uint(v_9), v_11);
-        uint v_13 = min(uint(v_10), 3u);
-        int v_14 = idx6();
-        int v_15 = (v_1.inner[v_12].a[v_13][min(uint(v_14), 3u)] + 1);
-        v_1.inner[v_12].a[v_13][min(uint(v_14), 3u)] = v_15;
+        int v_10 = idx4();
+        int v_11 = idx5();
+        uint v_12 = (uint(v_1.inner.length()) - 1u);
+        uint v_13 = min(uint(v_10), v_12);
+        uint v_14 = min(uint(v_11), 3u);
+        int v_15 = idx6();
+        int v_16 = (v_1.inner[v_13].a[v_14][min(uint(v_15), 3u)] + 1);
+        v_1.inner[v_13].a[v_14][min(uint(v_15), 3u)] = v_16;
       }
       continue;
     }
diff --git a/test/tint/statements/increment/for_loop_continuing.wgsl.expected.glsl b/test/tint/statements/increment/for_loop_continuing.wgsl.expected.glsl
index d860a00..184a5a4 100644
--- a/test/tint/statements/increment/for_loop_continuing.wgsl.expected.glsl
+++ b/test/tint/statements/increment/for_loop_continuing.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     while(true) {
diff --git a/test/tint/statements/increment/for_loop_initializer.wgsl.expected.glsl b/test/tint/statements/increment/for_loop_initializer.wgsl.expected.glsl
index f4f0263..9312112 100644
--- a/test/tint/statements/increment/for_loop_initializer.wgsl.expected.glsl
+++ b/test/tint/statements/increment/for_loop_initializer.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   {
     uvec2 tint_loop_idx = uvec2(0u);
     v.inner = (v.inner + 1u);
diff --git a/test/tint/statements/increment/function.wgsl.expected.glsl b/test/tint/statements/increment/function.wgsl.expected.glsl
index 102f66a..f569c14 100644
--- a/test/tint/statements/increment/function.wgsl.expected.glsl
+++ b/test/tint/statements/increment/function.wgsl.expected.glsl
@@ -1,6 +1,6 @@
 #version 310 es
 
-void tint_symbol() {
+void v() {
   int i = 0;
   i = (i + 1);
 }
diff --git a/test/tint/statements/increment/private.wgsl.expected.glsl b/test/tint/statements/increment/private.wgsl.expected.glsl
index 88c217d..447803f 100644
--- a/test/tint/statements/increment/private.wgsl.expected.glsl
+++ b/test/tint/statements/increment/private.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 int i = 0;
-void tint_symbol() {
+void v() {
   i = (i + 1);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/statements/increment/storage.wgsl.expected.glsl b/test/tint/statements/increment/storage.wgsl.expected.glsl
index f5fde7e..76aba7d 100644
--- a/test/tint/statements/increment/storage.wgsl.expected.glsl
+++ b/test/tint/statements/increment/storage.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer i_block_1_ssbo {
   uint inner;
 } v;
-void tint_symbol() {
+void v_1() {
   v.inner = (v.inner + 1u);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/statements/increment/vector_component.wgsl.expected.glsl b/test/tint/statements/increment/vector_component.wgsl.expected.glsl
index 37237a0..17beb6a 100644
--- a/test/tint/statements/increment/vector_component.wgsl.expected.glsl
+++ b/test/tint/statements/increment/vector_component.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 buffer a_block_1_ssbo {
   uvec4 inner;
 } v;
-void tint_symbol() {
+void v_1() {
   v.inner.y = (v.inner.y + 1u);
   v.inner.z = (v.inner.z + 1u);
 }
diff --git a/test/tint/statements/increment/workgroup.wgsl.expected.glsl b/test/tint/statements/increment/workgroup.wgsl.expected.glsl
index 6bcdf51..ea4092e 100644
--- a/test/tint/statements/increment/workgroup.wgsl.expected.glsl
+++ b/test/tint/statements/increment/workgroup.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int i;
-void tint_symbol() {
+void v() {
   i = (i + 1);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/types/functions/shader_io/attributes_on_struct_not_used_for_interface.wgsl.expected.glsl b/test/tint/types/functions/shader_io/attributes_on_struct_not_used_for_interface.wgsl.expected.glsl
index 0ecd781..9d2e01b 100644
--- a/test/tint/types/functions/shader_io/attributes_on_struct_not_used_for_interface.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/attributes_on_struct_not_used_for_interface.wgsl.expected.glsl
@@ -68,7 +68,7 @@
 };
 
 layout(binding = 0, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   S inner;
 } v_1;
 void tint_store_and_preserve_padding(S value_param) {
diff --git a/test/tint/types/functions/shader_io/compute_input_builtins.wgsl.expected.glsl b/test/tint/types/functions/shader_io/compute_input_builtins.wgsl.expected.glsl
index 3017dce..5293923 100644
--- a/test/tint/types/functions/shader_io/compute_input_builtins.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/compute_input_builtins.wgsl.expected.glsl
@@ -1,9 +1,9 @@
 #version 310 es
 
-void tint_symbol_inner(uvec3 local_invocation_id, uint local_invocation_index, uvec3 global_invocation_id, uvec3 workgroup_id, uvec3 num_workgroups) {
+void main_inner(uvec3 local_invocation_id, uint local_invocation_index, uvec3 global_invocation_id, uvec3 workgroup_id, uvec3 num_workgroups) {
   uint foo = ((((local_invocation_id.x + local_invocation_index) + global_invocation_id.x) + workgroup_id.x) + num_workgroups.x);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups);
+  main_inner(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups);
 }
diff --git a/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.glsl
index a487e8f..a56f2c4 100644
--- a/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/compute_input_builtins_struct.wgsl.expected.glsl
@@ -9,10 +9,10 @@
   uvec3 num_workgroups;
 };
 
-void tint_symbol_inner(ComputeInputs inputs) {
+void main_inner(ComputeInputs inputs) {
   uint foo = ((((inputs.local_invocation_id.x + inputs.local_invocation_index) + inputs.global_invocation_id.x) + inputs.workgroup_id.x) + inputs.num_workgroups.x);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(ComputeInputs(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups));
+  main_inner(ComputeInputs(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups));
 }
diff --git a/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.glsl b/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.glsl
index 989ad92..50959e2 100644
--- a/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/compute_input_mixed.wgsl.expected.glsl
@@ -9,7 +9,7 @@
   uvec3 workgroup_id;
 };
 
-void tint_symbol_inner(ComputeInputs0 inputs0, uint local_invocation_index, uvec3 global_invocation_id, ComputeInputs1 inputs1) {
+void main_inner(ComputeInputs0 inputs0, uint local_invocation_index, uvec3 global_invocation_id, ComputeInputs1 inputs1) {
   uint foo = (((inputs0.local_invocation_id.x + local_invocation_index) + global_invocation_id.x) + inputs1.workgroup_id.x);
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
@@ -17,5 +17,5 @@
   ComputeInputs0 v = ComputeInputs0(gl_LocalInvocationID);
   uint v_1 = gl_LocalInvocationIndex;
   uvec3 v_2 = gl_GlobalInvocationID;
-  tint_symbol_inner(v, v_1, v_2, ComputeInputs1(gl_WorkGroupID));
+  main_inner(v, v_1, v_2, ComputeInputs1(gl_WorkGroupID));
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.glsl
index 340dfe8..67da61a 100644
--- a/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_builtins.wgsl.expected.glsl
@@ -3,7 +3,7 @@
 precision highp float;
 precision highp int;
 
-void tint_symbol_inner(vec4 position, bool front_facing, uint sample_index, uint sample_mask) {
+void main_inner(vec4 position, bool front_facing, uint sample_index, uint sample_mask) {
   if (front_facing) {
     vec4 foo = position;
     uint bar = (sample_index + sample_mask);
@@ -13,5 +13,5 @@
   vec4 v = gl_FragCoord;
   bool v_1 = gl_FrontFacing;
   uint v_2 = uint(gl_SampleID);
-  tint_symbol_inner(v, v_1, v_2, uint(gl_SampleMaskIn[0u]));
+  main_inner(v, v_1, v_2, uint(gl_SampleMaskIn[0u]));
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl
index 826ed63..6c9bdd2 100644
--- a/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl
@@ -11,7 +11,7 @@
   uint sample_mask;
 };
 
-void tint_symbol_inner(FragmentInputs inputs) {
+void main_inner(FragmentInputs inputs) {
   if (inputs.front_facing) {
     vec4 foo = inputs.position;
     uint bar = (inputs.sample_index + inputs.sample_mask);
@@ -21,5 +21,5 @@
   vec4 v = gl_FragCoord;
   bool v_1 = gl_FrontFacing;
   uint v_2 = uint(gl_SampleID);
-  tint_symbol_inner(FragmentInputs(v, v_1, v_2, uint(gl_SampleMaskIn[0u])));
+  main_inner(FragmentInputs(v, v_1, v_2, uint(gl_SampleMaskIn[0u])));
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_locations.wgsl.expected.glsl
index 2610dbb..90f20f9 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_locations.wgsl.expected.glsl
@@ -6,12 +6,12 @@
 layout(location = 1) flat in uint tint_interstage_location1;
 layout(location = 2) in float tint_interstage_location2;
 layout(location = 3) in vec4 tint_interstage_location3;
-void tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3) {
+void main_inner(int loc0, uint loc1, float loc2, vec4 loc3) {
   int i = loc0;
   uint u = loc1;
   float f = loc2;
   vec4 v = loc3;
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3);
+  main_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3);
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_locations_f16.wgsl.expected.glsl
index 89a1641..8f83acc 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_locations_f16.wgsl.expected.glsl
@@ -9,7 +9,7 @@
 layout(location = 3) in vec4 tint_interstage_location3;
 layout(location = 4) in float16_t tint_interstage_location4;
 layout(location = 5) in f16vec3 tint_interstage_location5;
-void tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3, float16_t loc4, f16vec3 loc5) {
+void main_inner(int loc0, uint loc1, float loc2, vec4 loc3, float16_t loc4, f16vec3 loc5) {
   int i = loc0;
   uint u = loc1;
   float f = loc2;
@@ -18,5 +18,5 @@
   f16vec3 y = loc5;
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5);
+  main_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5);
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
index d9b5984..626c341 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_locations_struct.wgsl.expected.glsl
@@ -14,12 +14,12 @@
 layout(location = 1) flat in uint tint_interstage_location1;
 layout(location = 2) in float tint_interstage_location2;
 layout(location = 3) in vec4 tint_interstage_location3;
-void tint_symbol_inner(FragmentInputs inputs) {
+void main_inner(FragmentInputs inputs) {
   int i = inputs.loc0;
   uint u = inputs.loc1;
   float f = inputs.loc2;
   vec4 v = inputs.loc3;
 }
 void main() {
-  tint_symbol_inner(FragmentInputs(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3));
+  main_inner(FragmentInputs(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3));
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.glsl
index a5533e8..1a7976e 100644
--- a/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_locations_struct_f16.wgsl.expected.glsl
@@ -19,7 +19,7 @@
 layout(location = 3) in vec4 tint_interstage_location3;
 layout(location = 4) in float16_t tint_interstage_location4;
 layout(location = 5) in f16vec3 tint_interstage_location5;
-void tint_symbol_inner(FragmentInputs inputs) {
+void main_inner(FragmentInputs inputs) {
   int i = inputs.loc0;
   uint u = inputs.loc1;
   float f = inputs.loc2;
@@ -28,5 +28,5 @@
   f16vec3 y = inputs.loc5;
 }
 void main() {
-  tint_symbol_inner(FragmentInputs(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5));
+  main_inner(FragmentInputs(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5));
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.glsl
index 8b6be215..3d2e2f6 100644
--- a/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_mixed.wgsl.expected.glsl
@@ -18,7 +18,7 @@
 layout(location = 1) flat in uint tint_interstage_location1;
 layout(location = 3) in vec4 tint_interstage_location3;
 layout(location = 2) in float tint_interstage_location2;
-void tint_symbol_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2) {
+void main_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2) {
   if (front_facing) {
     vec4 foo = inputs0.position;
     uint bar = (sample_index + inputs1.sample_mask);
@@ -35,5 +35,5 @@
   uint v_4 = uint(gl_SampleID);
   vec4 v_5 = tint_interstage_location3;
   FragmentInputs1 v_6 = FragmentInputs1(v_5, uint(gl_SampleMaskIn[0u]));
-  tint_symbol_inner(v_1, v_2, v_3, v_4, v_6, tint_interstage_location2);
+  main_inner(v_1, v_2, v_3, v_4, v_6, tint_interstage_location2);
 }
diff --git a/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.glsl
index 812abca..193abbc 100644
--- a/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_input_mixed_f16.wgsl.expected.glsl
@@ -22,7 +22,7 @@
 layout(location = 5) in f16vec3 tint_interstage_location5;
 layout(location = 2) in float tint_interstage_location2;
 layout(location = 4) in float16_t tint_interstage_location4;
-void tint_symbol_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2, float16_t loc4) {
+void main_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2, float16_t loc4) {
   if (front_facing) {
     vec4 foo = inputs0.position;
     uint bar = (sample_index + inputs1.sample_mask);
@@ -42,5 +42,5 @@
   vec4 v_5 = tint_interstage_location3;
   f16vec3 v_6 = tint_interstage_location5;
   FragmentInputs1 v_7 = FragmentInputs1(v_5, v_6, uint(gl_SampleMaskIn[0u]));
-  tint_symbol_inner(v_1, v_2, v_3, v_4, v_7, tint_interstage_location2, tint_interstage_location4);
+  main_inner(v_1, v_2, v_3, v_4, v_7, tint_interstage_location2, tint_interstage_location4);
 }
diff --git a/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl
index 9d3e79b..3e3711d 100644
--- a/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl
@@ -15,11 +15,11 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-FragmentOutputs tint_symbol_inner() {
+FragmentOutputs main_inner() {
   return FragmentOutputs(1.0f, 1u);
 }
 void main() {
-  FragmentOutputs v = tint_symbol_inner();
+  FragmentOutputs v = main_inner();
   gl_FragDepth = clamp(v.frag_depth, tint_push_constants.tint_frag_depth_min, tint_push_constants.tint_frag_depth_max);
   gl_SampleMask[0u] = int(v.sample_mask);
 }
diff --git a/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
index a215a04..7404c30 100644
--- a/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_output_locations_struct.wgsl.expected.glsl
@@ -10,17 +10,17 @@
   vec4 loc3;
 };
 
-layout(location = 0) out int tint_symbol_loc0_Output;
-layout(location = 1) out uint tint_symbol_loc1_Output;
-layout(location = 2) out float tint_symbol_loc2_Output;
-layout(location = 3) out vec4 tint_symbol_loc3_Output;
-FragmentOutputs tint_symbol_inner() {
+layout(location = 0) out int main_loc0_Output;
+layout(location = 1) out uint main_loc1_Output;
+layout(location = 2) out float main_loc2_Output;
+layout(location = 3) out vec4 main_loc3_Output;
+FragmentOutputs main_inner() {
   return FragmentOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f));
 }
 void main() {
-  FragmentOutputs v = tint_symbol_inner();
-  tint_symbol_loc0_Output = v.loc0;
-  tint_symbol_loc1_Output = v.loc1;
-  tint_symbol_loc2_Output = v.loc2;
-  tint_symbol_loc3_Output = v.loc3;
+  FragmentOutputs v = main_inner();
+  main_loc0_Output = v.loc0;
+  main_loc1_Output = v.loc1;
+  main_loc2_Output = v.loc2;
+  main_loc3_Output = v.loc3;
 }
diff --git a/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.glsl
index de73639..c3db63f 100644
--- a/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_output_locations_struct_f16.wgsl.expected.glsl
@@ -13,21 +13,21 @@
   f16vec3 loc5;
 };
 
-layout(location = 0) out int tint_symbol_loc0_Output;
-layout(location = 1) out uint tint_symbol_loc1_Output;
-layout(location = 2) out float tint_symbol_loc2_Output;
-layout(location = 3) out vec4 tint_symbol_loc3_Output;
-layout(location = 4) out float16_t tint_symbol_loc4_Output;
-layout(location = 5) out f16vec3 tint_symbol_loc5_Output;
-FragmentOutputs tint_symbol_inner() {
+layout(location = 0) out int main_loc0_Output;
+layout(location = 1) out uint main_loc1_Output;
+layout(location = 2) out float main_loc2_Output;
+layout(location = 3) out vec4 main_loc3_Output;
+layout(location = 4) out float16_t main_loc4_Output;
+layout(location = 5) out f16vec3 main_loc5_Output;
+FragmentOutputs main_inner() {
   return FragmentOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f), 2.25hf, f16vec3(3.0hf, 5.0hf, 8.0hf));
 }
 void main() {
-  FragmentOutputs v = tint_symbol_inner();
-  tint_symbol_loc0_Output = v.loc0;
-  tint_symbol_loc1_Output = v.loc1;
-  tint_symbol_loc2_Output = v.loc2;
-  tint_symbol_loc3_Output = v.loc3;
-  tint_symbol_loc4_Output = v.loc4;
-  tint_symbol_loc5_Output = v.loc5;
+  FragmentOutputs v = main_inner();
+  main_loc0_Output = v.loc0;
+  main_loc1_Output = v.loc1;
+  main_loc2_Output = v.loc2;
+  main_loc3_Output = v.loc3;
+  main_loc4_Output = v.loc4;
+  main_loc5_Output = v.loc5;
 }
diff --git a/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.glsl
index a56141e..6d0e1a5 100644
--- a/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_output_mixed.wgsl.expected.glsl
@@ -19,19 +19,19 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-layout(location = 0) out int tint_symbol_loc0_Output;
-layout(location = 1) out uint tint_symbol_loc1_Output;
-layout(location = 2) out float tint_symbol_loc2_Output;
-layout(location = 3) out vec4 tint_symbol_loc3_Output;
-FragmentOutputs tint_symbol_inner() {
+layout(location = 0) out int main_loc0_Output;
+layout(location = 1) out uint main_loc1_Output;
+layout(location = 2) out float main_loc2_Output;
+layout(location = 3) out vec4 main_loc3_Output;
+FragmentOutputs main_inner() {
   return FragmentOutputs(1, 2.0f, 1u, 1.0f, 2u, vec4(1.0f, 2.0f, 3.0f, 4.0f));
 }
 void main() {
-  FragmentOutputs v = tint_symbol_inner();
-  tint_symbol_loc0_Output = v.loc0;
+  FragmentOutputs v = main_inner();
+  main_loc0_Output = v.loc0;
   gl_FragDepth = clamp(v.frag_depth, tint_push_constants.tint_frag_depth_min, tint_push_constants.tint_frag_depth_max);
-  tint_symbol_loc1_Output = v.loc1;
-  tint_symbol_loc2_Output = v.loc2;
+  main_loc1_Output = v.loc1;
+  main_loc2_Output = v.loc2;
   gl_SampleMask[0u] = int(v.sample_mask);
-  tint_symbol_loc3_Output = v.loc3;
+  main_loc3_Output = v.loc3;
 }
diff --git a/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.glsl
index f78dbb0..c675f12 100644
--- a/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/fragment_output_mixed_f16.wgsl.expected.glsl
@@ -22,23 +22,23 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-layout(location = 0) out int tint_symbol_loc0_Output;
-layout(location = 1) out uint tint_symbol_loc1_Output;
-layout(location = 2) out float tint_symbol_loc2_Output;
-layout(location = 3) out vec4 tint_symbol_loc3_Output;
-layout(location = 4) out float16_t tint_symbol_loc4_Output;
-layout(location = 5) out f16vec3 tint_symbol_loc5_Output;
-FragmentOutputs tint_symbol_inner() {
+layout(location = 0) out int main_loc0_Output;
+layout(location = 1) out uint main_loc1_Output;
+layout(location = 2) out float main_loc2_Output;
+layout(location = 3) out vec4 main_loc3_Output;
+layout(location = 4) out float16_t main_loc4_Output;
+layout(location = 5) out f16vec3 main_loc5_Output;
+FragmentOutputs main_inner() {
   return FragmentOutputs(1, 2.0f, 1u, 1.0f, 2u, vec4(1.0f, 2.0f, 3.0f, 4.0f), 2.25hf, f16vec3(3.0hf, 5.0hf, 8.0hf));
 }
 void main() {
-  FragmentOutputs v = tint_symbol_inner();
-  tint_symbol_loc0_Output = v.loc0;
+  FragmentOutputs v = main_inner();
+  main_loc0_Output = v.loc0;
   gl_FragDepth = clamp(v.frag_depth, tint_push_constants.tint_frag_depth_min, tint_push_constants.tint_frag_depth_max);
-  tint_symbol_loc1_Output = v.loc1;
-  tint_symbol_loc2_Output = v.loc2;
+  main_loc1_Output = v.loc1;
+  main_loc2_Output = v.loc2;
   gl_SampleMask[0u] = int(v.sample_mask);
-  tint_symbol_loc3_Output = v.loc3;
-  tint_symbol_loc4_Output = v.loc4;
-  tint_symbol_loc5_Output = v.loc5;
+  main_loc3_Output = v.loc3;
+  main_loc4_Output = v.loc4;
+  main_loc5_Output = v.loc5;
 }
diff --git a/test/tint/types/functions/shader_io/interpolate_input_parameters.wgsl.expected.glsl b/test/tint/types/functions/shader_io/interpolate_input_parameters.wgsl.expected.glsl
index d313670..f45e876 100644
--- a/test/tint/types/functions/shader_io/interpolate_input_parameters.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/interpolate_input_parameters.wgsl.expected.glsl
@@ -12,8 +12,8 @@
 layout(location = 7) in float tint_interstage_location7;
 layout(location = 8) in float tint_interstage_location8;
 layout(location = 9) in float tint_interstage_location9;
-void tint_symbol_inner(float none, float tint_symbol_1, float perspective_center, float perspective_centroid, float perspective_sample, float linear_center, float linear_centroid, float linear_sample, float perspective_default, float linear_default) {
+void main_inner(float none, float v, float perspective_center, float perspective_centroid, float perspective_sample, float linear_center, float linear_centroid, float linear_sample, float perspective_default, float linear_default) {
 }
 void main() {
-  tint_symbol_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5, tint_interstage_location6, tint_interstage_location7, tint_interstage_location8, tint_interstage_location9);
+  main_inner(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5, tint_interstage_location6, tint_interstage_location7, tint_interstage_location8, tint_interstage_location9);
 }
diff --git a/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.glsl
index 02efaff..faf9452 100644
--- a/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/interpolate_input_struct.wgsl.expected.glsl
@@ -5,7 +5,7 @@
 
 struct In {
   float none;
-  float tint_symbol;
+  float member_1;
   float perspective_center;
   float perspective_centroid;
   float perspective_sample;
@@ -26,8 +26,8 @@
 layout(location = 7) in float tint_interstage_location7;
 layout(location = 8) in float tint_interstage_location8;
 layout(location = 9) in float tint_interstage_location9;
-void tint_symbol_1_inner(In tint_symbol_2) {
+void main_inner(In v) {
 }
 void main() {
-  tint_symbol_1_inner(In(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5, tint_interstage_location6, tint_interstage_location7, tint_interstage_location8, tint_interstage_location9));
+  main_inner(In(tint_interstage_location0, tint_interstage_location1, tint_interstage_location2, tint_interstage_location3, tint_interstage_location4, tint_interstage_location5, tint_interstage_location6, tint_interstage_location7, tint_interstage_location8, tint_interstage_location9));
 }
diff --git a/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.glsl
index caf586b..ffa3a3c 100644
--- a/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/interpolate_return_struct.wgsl.expected.glsl
@@ -4,7 +4,7 @@
 struct Out {
   vec4 pos;
   float none;
-  float tint_symbol;
+  float member_2;
   float perspective_center;
   float perspective_centroid;
   float perspective_sample;
@@ -21,16 +21,16 @@
 layout(location = 5) out float tint_interstage_location5;
 layout(location = 6) centroid out float tint_interstage_location6;
 layout(location = 7) out float tint_interstage_location7;
-Out tint_symbol_1_inner() {
+Out main_inner() {
   return Out(vec4(0.0f), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
 }
 void main() {
-  Out v = tint_symbol_1_inner();
+  Out v = main_inner();
   gl_Position = v.pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   tint_interstage_location0 = v.none;
-  tint_interstage_location1 = v.tint_symbol;
+  tint_interstage_location1 = v.member_2;
   tint_interstage_location2 = v.perspective_center;
   tint_interstage_location3 = v.perspective_centroid;
   tint_interstage_location4 = v.perspective_sample;
diff --git a/test/tint/types/functions/shader_io/invariant.wgsl.expected.glsl b/test/tint/types/functions/shader_io/invariant.wgsl.expected.glsl
index c8a7d93..4eb06c7 100644
--- a/test/tint/types/functions/shader_io/invariant.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/invariant.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.glsl b/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.glsl
index cfd3e19..720d0ff 100644
--- a/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/invariant_struct_member.wgsl.expected.glsl
@@ -5,11 +5,11 @@
   vec4 pos;
 };
 
-Out tint_symbol_inner() {
+Out main_inner() {
   return Out(vec4(0.0f));
 }
 void main() {
-  gl_Position = tint_symbol_inner().pos;
+  gl_Position = main_inner().pos;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl b/test/tint/types/functions/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
index b95f4ad..4099ca0 100644
--- a/test/tint/types/functions/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl
@@ -68,7 +68,7 @@
 };
 
 layout(binding = 0, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   S inner;
 } v_1;
 layout(location = 0) in float tint_interstage_location0;
@@ -78,11 +78,11 @@
   v_1.inner.u = value_param.u;
   v_1.inner.v = value_param.v;
 }
-void frag_main_inner(S tint_symbol_1) {
-  float f = tint_symbol_1.f;
-  uint u = tint_symbol_1.u;
-  vec4 v = tint_symbol_1.v;
-  tint_store_and_preserve_padding(tint_symbol_1);
+void frag_main_inner(S v_2) {
+  float f = v_2.f;
+  uint u = v_2.u;
+  vec4 v = v_2.v;
+  tint_store_and_preserve_padding(v_2);
 }
 void main() {
   frag_main_inner(S(tint_interstage_location0, tint_interstage_location1, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, gl_FragCoord, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u));
diff --git a/test/tint/types/functions/shader_io/shared_struct_storage_buffer_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/shared_struct_storage_buffer_f16.wgsl.expected.glsl
index 9929df7..7251865 100644
--- a/test/tint/types/functions/shader_io/shared_struct_storage_buffer_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/shared_struct_storage_buffer_f16.wgsl.expected.glsl
@@ -68,7 +68,7 @@
 };
 
 layout(binding = 0, std430)
-buffer f_tint_symbol_block_ssbo {
+buffer f_output_block_ssbo {
   S inner;
 } v_1;
 layout(location = 0) in float tint_interstage_location0;
@@ -82,13 +82,13 @@
   v_1.inner.x = value_param.x;
   v_1.inner.y = value_param.y;
 }
-void frag_main_inner(S tint_symbol_1) {
-  float f = tint_symbol_1.f;
-  uint u = tint_symbol_1.u;
-  vec4 v = tint_symbol_1.v;
-  float16_t x = tint_symbol_1.x;
-  f16vec3 y = tint_symbol_1.y;
-  tint_store_and_preserve_padding(tint_symbol_1);
+void frag_main_inner(S v_2) {
+  float f = v_2.f;
+  uint u = v_2.u;
+  vec4 v = v_2.v;
+  float16_t x = v_2.x;
+  f16vec3 y = v_2.y;
+  tint_store_and_preserve_padding(v_2);
 }
 void main() {
   frag_main_inner(S(tint_interstage_location0, tint_interstage_location1, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, gl_FragCoord, 0u, 0u, 0u, 0u, tint_interstage_location2, 0u, 0u, 0u, 0u, 0u, 0u, 0u, tint_interstage_location3, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u));
diff --git a/test/tint/types/functions/shader_io/vertex_input_builtins.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_builtins.wgsl.expected.glsl
index 8d63f18..857445e 100644
--- a/test/tint/types/functions/shader_io/vertex_input_builtins.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_builtins.wgsl.expected.glsl
@@ -6,14 +6,14 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-vec4 tint_symbol_inner(uint vertex_index, uint instance_index) {
+vec4 main_inner(uint vertex_index, uint instance_index) {
   uint foo = (vertex_index + instance_index);
   return vec4(0.0f);
 }
 void main() {
   uint v = uint(gl_VertexID);
   uint v_1 = uint(gl_InstanceID);
-  gl_Position = tint_symbol_inner(v, (v_1 + tint_push_constants.tint_first_instance));
+  gl_Position = main_inner(v, (v_1 + tint_push_constants.tint_first_instance));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl
index 2bb7846..0b7907f 100644
--- a/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl
@@ -11,14 +11,14 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-vec4 tint_symbol_inner(VertexInputs inputs) {
+vec4 main_inner(VertexInputs inputs) {
   uint foo = (inputs.vertex_index + inputs.instance_index);
   return vec4(0.0f);
 }
 void main() {
   uint v = uint(gl_VertexID);
   uint v_1 = uint(gl_InstanceID);
-  gl_Position = tint_symbol_inner(VertexInputs(v, (v_1 + tint_push_constants.tint_first_instance)));
+  gl_Position = main_inner(VertexInputs(v, (v_1 + tint_push_constants.tint_first_instance)));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_locations.wgsl.expected.glsl
index 7a3991d..159c7b5 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_locations.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-vec4 tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+vec4 main_inner(int loc0, uint loc1, float loc2, vec4 loc3) {
   int i = loc0;
   uint u = loc1;
   float f = loc2;
@@ -12,7 +12,7 @@
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(tint_symbol_loc0_Input, tint_symbol_loc1_Input, tint_symbol_loc2_Input, tint_symbol_loc3_Input);
+  gl_Position = main_inner(main_loc0_Input, main_loc1_Input, main_loc2_Input, main_loc3_Input);
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_locations_f16.wgsl.expected.glsl
index b06b1cd..9a7d63c 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_locations_f16.wgsl.expected.glsl
@@ -1,13 +1,13 @@
 #version 310 es
 #extension GL_AMD_gpu_shader_half_float: require
 
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-layout(location = 4) in float16_t tint_symbol_loc4_Input;
-layout(location = 5) in f16vec3 tint_symbol_loc5_Input;
-vec4 tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3, float16_t loc4, f16vec3 loc5) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+layout(location = 4) in float16_t main_loc4_Input;
+layout(location = 5) in f16vec3 main_loc5_Input;
+vec4 main_inner(int loc0, uint loc1, float loc2, vec4 loc3, float16_t loc4, f16vec3 loc5) {
   int i = loc0;
   uint u = loc1;
   float f = loc2;
@@ -17,7 +17,7 @@
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(tint_symbol_loc0_Input, tint_symbol_loc1_Input, tint_symbol_loc2_Input, tint_symbol_loc3_Input, tint_symbol_loc4_Input, tint_symbol_loc5_Input);
+  gl_Position = main_inner(main_loc0_Input, main_loc1_Input, main_loc2_Input, main_loc3_Input, main_loc4_Input, main_loc5_Input);
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
index c2f6037..bc8ae34 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_locations_struct.wgsl.expected.glsl
@@ -8,11 +8,11 @@
   vec4 loc3;
 };
 
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-vec4 tint_symbol_inner(VertexInputs inputs) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+vec4 main_inner(VertexInputs inputs) {
   int i = inputs.loc0;
   uint u = inputs.loc1;
   float f = inputs.loc2;
@@ -20,7 +20,7 @@
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(VertexInputs(tint_symbol_loc0_Input, tint_symbol_loc1_Input, tint_symbol_loc2_Input, tint_symbol_loc3_Input));
+  gl_Position = main_inner(VertexInputs(main_loc0_Input, main_loc1_Input, main_loc2_Input, main_loc3_Input));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.glsl
index 1332bab..8db617a 100644
--- a/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_locations_struct_f16.wgsl.expected.glsl
@@ -11,13 +11,13 @@
   f16vec3 loc5;
 };
 
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-layout(location = 4) in float16_t tint_symbol_loc4_Input;
-layout(location = 5) in f16vec3 tint_symbol_loc5_Input;
-vec4 tint_symbol_inner(VertexInputs inputs) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+layout(location = 4) in float16_t main_loc4_Input;
+layout(location = 5) in f16vec3 main_loc5_Input;
+vec4 main_inner(VertexInputs inputs) {
   int i = inputs.loc0;
   uint u = inputs.loc1;
   float f = inputs.loc2;
@@ -27,7 +27,7 @@
   return vec4(0.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(VertexInputs(tint_symbol_loc0_Input, tint_symbol_loc1_Input, tint_symbol_loc2_Input, tint_symbol_loc3_Input, tint_symbol_loc4_Input, tint_symbol_loc5_Input));
+  gl_Position = main_inner(VertexInputs(main_loc0_Input, main_loc1_Input, main_loc2_Input, main_loc3_Input, main_loc4_Input, main_loc5_Input));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.glsl
index 9677318..4f624d2 100644
--- a/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_mixed.wgsl.expected.glsl
@@ -16,11 +16,11 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+vec4 main_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) {
   uint foo = (inputs0.vertex_index + instance_index);
   int i = inputs0.loc0;
   uint u = loc1;
@@ -30,11 +30,11 @@
 }
 void main() {
   uint v_1 = uint(gl_VertexID);
-  VertexInputs0 v_2 = VertexInputs0(v_1, tint_symbol_loc0_Input);
-  uint v_3 = tint_symbol_loc1_Input;
+  VertexInputs0 v_2 = VertexInputs0(v_1, main_loc0_Input);
+  uint v_3 = main_loc1_Input;
   uint v_4 = uint(gl_InstanceID);
   uint v_5 = (v_4 + tint_push_constants.tint_first_instance);
-  gl_Position = tint_symbol_inner(v_2, v_3, v_5, VertexInputs1(tint_symbol_loc2_Input, tint_symbol_loc3_Input));
+  gl_Position = main_inner(v_2, v_3, v_5, VertexInputs1(main_loc2_Input, main_loc3_Input));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.glsl
index 0e56aaf..b51496a 100644
--- a/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_input_mixed_f16.wgsl.expected.glsl
@@ -18,13 +18,13 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-layout(location = 0) in int tint_symbol_loc0_Input;
-layout(location = 1) in uint tint_symbol_loc1_Input;
-layout(location = 2) in float tint_symbol_loc2_Input;
-layout(location = 3) in vec4 tint_symbol_loc3_Input;
-layout(location = 5) in f16vec3 tint_symbol_loc5_Input;
-layout(location = 4) in float16_t tint_symbol_loc4_Input;
-vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1, float16_t loc4) {
+layout(location = 0) in int main_loc0_Input;
+layout(location = 1) in uint main_loc1_Input;
+layout(location = 2) in float main_loc2_Input;
+layout(location = 3) in vec4 main_loc3_Input;
+layout(location = 5) in f16vec3 main_loc5_Input;
+layout(location = 4) in float16_t main_loc4_Input;
+vec4 main_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1, float16_t loc4) {
   uint foo = (inputs0.vertex_index + instance_index);
   int i = inputs0.loc0;
   uint u = loc1;
@@ -36,12 +36,12 @@
 }
 void main() {
   uint v_1 = uint(gl_VertexID);
-  VertexInputs0 v_2 = VertexInputs0(v_1, tint_symbol_loc0_Input);
-  uint v_3 = tint_symbol_loc1_Input;
+  VertexInputs0 v_2 = VertexInputs0(v_1, main_loc0_Input);
+  uint v_3 = main_loc1_Input;
   uint v_4 = uint(gl_InstanceID);
   uint v_5 = (v_4 + tint_push_constants.tint_first_instance);
-  VertexInputs1 v_6 = VertexInputs1(tint_symbol_loc2_Input, tint_symbol_loc3_Input, tint_symbol_loc5_Input);
-  gl_Position = tint_symbol_inner(v_2, v_3, v_5, v_6, tint_symbol_loc4_Input);
+  VertexInputs1 v_6 = VertexInputs1(main_loc2_Input, main_loc3_Input, main_loc5_Input);
+  gl_Position = main_inner(v_2, v_3, v_5, v_6, main_loc4_Input);
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_output_builtins.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_output_builtins.wgsl.expected.glsl
index d3c27ae..8faad04 100644
--- a/test/tint/types/functions/shader_io/vertex_output_builtins.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_output_builtins.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
-vec4 tint_symbol_inner() {
+vec4 main_inner() {
   return vec4(1.0f, 2.0f, 3.0f, 4.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner();
+  gl_Position = main_inner();
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl
index 4fc1e5c..6dc3afc 100644
--- a/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl
@@ -5,11 +5,11 @@
   vec4 position;
 };
 
-VertexOutputs tint_symbol_inner() {
+VertexOutputs main_inner() {
   return VertexOutputs(vec4(1.0f, 2.0f, 3.0f, 4.0f));
 }
 void main() {
-  gl_Position = tint_symbol_inner().position;
+  gl_Position = main_inner().position;
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
index e205618..89e7939 100644
--- a/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_output_locations_struct.wgsl.expected.glsl
@@ -13,11 +13,11 @@
 layout(location = 1) flat out uint tint_interstage_location1;
 layout(location = 2) out float tint_interstage_location2;
 layout(location = 3) out vec4 tint_interstage_location3;
-VertexOutputs tint_symbol_inner() {
+VertexOutputs main_inner() {
   return VertexOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(0.0f));
 }
 void main() {
-  VertexOutputs v = tint_symbol_inner();
+  VertexOutputs v = main_inner();
   tint_interstage_location0 = v.loc0;
   tint_interstage_location1 = v.loc1;
   tint_interstage_location2 = v.loc2;
diff --git a/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.glsl b/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.glsl
index f7c146a..adf9502 100644
--- a/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.glsl
+++ b/test/tint/types/functions/shader_io/vertex_output_locations_struct_f16.wgsl.expected.glsl
@@ -18,11 +18,11 @@
 layout(location = 3) out vec4 tint_interstage_location3;
 layout(location = 4) out float16_t tint_interstage_location4;
 layout(location = 5) out f16vec3 tint_interstage_location5;
-VertexOutputs tint_symbol_inner() {
+VertexOutputs main_inner() {
   return VertexOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(0.0f), 2.25hf, f16vec3(3.0hf, 5.0hf, 8.0hf));
 }
 void main() {
-  VertexOutputs v = tint_symbol_inner();
+  VertexOutputs v = main_inner();
   tint_interstage_location0 = v.loc0;
   tint_interstage_location1 = v.loc1;
   tint_interstage_location2 = v.loc2;
diff --git a/test/tint/types/module_scope_used_in_functions.wgsl.expected.glsl b/test/tint/types/module_scope_used_in_functions.wgsl.expected.glsl
index 62ee64d..60f29328 100644
--- a/test/tint/types/module_scope_used_in_functions.wgsl.expected.glsl
+++ b/test/tint/types/module_scope_used_in_functions.wgsl.expected.glsl
@@ -28,7 +28,7 @@
   bar(a, b);
   no_uses();
 }
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     w = 0.0f;
   }
@@ -37,5 +37,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/types/module_scope_var.wgsl.expected.glsl b/test/tint/types/module_scope_var.wgsl.expected.glsl
index 586906b..eb5bd87 100644
--- a/test/tint/types/module_scope_var.wgsl.expected.glsl
+++ b/test/tint/types/module_scope_var.wgsl.expected.glsl
@@ -16,7 +16,7 @@
 float arr_var[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f);
 S struct_var = S(0.0f);
 shared float wg_var;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     wg_var = 0.0f;
   }
@@ -35,5 +35,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/types/module_scope_vars_pointers.wgsl.expected.glsl b/test/tint/types/module_scope_vars_pointers.wgsl.expected.glsl
index 1ef678e..b160de4 100644
--- a/test/tint/types/module_scope_vars_pointers.wgsl.expected.glsl
+++ b/test/tint/types/module_scope_vars_pointers.wgsl.expected.glsl
@@ -2,7 +2,7 @@
 
 float p = 0.0f;
 shared float w;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     w = 0.0f;
   }
@@ -12,5 +12,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/types/short_names/short_names.wgsl.expected.glsl b/test/tint/types/short_names/short_names.wgsl.expected.glsl
index ce1bea7..f8ccb70 100644
--- a/test/tint/types/short_names/short_names.wgsl.expected.glsl
+++ b/test/tint/types/short_names/short_names.wgsl.expected.glsl
@@ -1,10 +1,10 @@
 #version 310 es
 
-vec4 tint_symbol_inner(uint VertexIndex) {
+vec4 main_inner(uint VertexIndex) {
   return vec4(0.0f, 0.0f, 0.0f, 1.0f);
 }
 void main() {
-  gl_Position = tint_symbol_inner(uint(gl_VertexID));
+  gl_Position = main_inner(uint(gl_VertexID));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/types/texture/depth/2d.wgsl.expected.glsl b/test/tint/types/texture/depth/2d.wgsl.expected.glsl
index 5a1cabf..bf850c5 100644
--- a/test/tint/types/texture/depth/2d.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/2d.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D t_f;
diff --git a/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl b/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
index af3ad28..01d1a59 100644
--- a/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/2d_array.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray t_f;
diff --git a/test/tint/types/texture/depth/cube.wgsl.expected.glsl b/test/tint/types/texture/depth/cube.wgsl.expected.glsl
index d34a5d6..1d98f3f 100644
--- a/test/tint/types/texture/depth/cube.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/cube.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube t_f;
diff --git a/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl b/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
index 0a38be7..61fe19e 100644
--- a/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/depth/cube_array.wgsl.expected.glsl
@@ -6,7 +6,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray t_f;
diff --git a/test/tint/types/texture/sampled/1d.wgsl.expected.glsl b/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
index 23ad77a..9473c3f 100644
--- a/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/1d.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D t_f;
diff --git a/test/tint/types/texture/sampled/2d.wgsl.expected.glsl b/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
index b11a228..592c999 100644
--- a/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/2d.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2D t_f;
diff --git a/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl b/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
index 2c0c7cd..d7ff15c 100644
--- a/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/2d_array.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler2DArray t_f;
diff --git a/test/tint/types/texture/sampled/3d.wgsl.expected.glsl b/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
index e76f5ff..daa1904 100644
--- a/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/3d.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp sampler3D t_f;
diff --git a/test/tint/types/texture/sampled/cube.wgsl.expected.glsl b/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
index e13147a..861e926 100644
--- a/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/cube.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCube t_f;
diff --git a/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl b/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
index 32a9cf9..44fa550 100644
--- a/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
+++ b/test/tint/types/texture/sampled/cube_array.wgsl.expected.glsl
@@ -8,7 +8,7 @@
 };
 
 layout(binding = 0, std140)
-uniform tint_symbol_1_1_ubo {
+uniform tint_symbol_1_ubo {
   TintTextureUniformData inner;
 } v;
 uniform highp samplerCubeArray t_f;
diff --git a/test/tint/unicode/identifiers.wgsl.expected.glsl b/test/tint/unicode/identifiers.wgsl.expected.glsl
index 8603a35..ad04dfb 100644
--- a/test/tint/unicode/identifiers.wgsl.expected.glsl
+++ b/test/tint/unicode/identifiers.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-float tint_symbol_2(int tint_symbol_3) {
-  return float(tint_symbol_3);
+float v(int v_1) {
+  return float(v_1);
 }
 void main() {
-  int tint_symbol_5 = 0;
-  float tint_symbol_6 = tint_symbol_2(tint_symbol_5);
+  int v_2 = 0;
+  float v_3 = v(v_2);
 }
diff --git a/test/tint/var/inferred/function.wgsl.expected.glsl b/test/tint/var/inferred/function.wgsl.expected.glsl
index dec2b19..ef11109 100644
--- a/test/tint/var/inferred/function.wgsl.expected.glsl
+++ b/test/tint/var/inferred/function.wgsl.expected.glsl
@@ -2,10 +2,10 @@
 precision highp float;
 precision highp int;
 
-layout(location = 0) out vec4 tint_symbol_loc0_Output;
-vec4 tint_symbol_inner() {
+layout(location = 0) out vec4 main_loc0_Output;
+vec4 main_inner() {
   return vec4(0.0f);
 }
 void main() {
-  tint_symbol_loc0_Output = tint_symbol_inner();
+  main_loc0_Output = main_inner();
 }
diff --git a/test/tint/var/initialization/function/nested_structs.wgsl.expected.glsl b/test/tint/var/initialization/function/nested_structs.wgsl.expected.glsl
index 75ed0fb..e5b743a 100644
--- a/test/tint/var/initialization/function/nested_structs.wgsl.expected.glsl
+++ b/test/tint/var/initialization/function/nested_structs.wgsl.expected.glsl
@@ -14,7 +14,7 @@
 };
 
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   int inner;
 } v;
 int f(S3 s3) {
diff --git a/test/tint/var/initialization/private/nested_structs.wgsl.expected.glsl b/test/tint/var/initialization/private/nested_structs.wgsl.expected.glsl
index 15186c0..1a55add 100644
--- a/test/tint/var/initialization/private/nested_structs.wgsl.expected.glsl
+++ b/test/tint/var/initialization/private/nested_structs.wgsl.expected.glsl
@@ -15,7 +15,7 @@
 
 S3 P = S3(S2(S1(42)));
 layout(binding = 0, std430)
-buffer tint_symbol_block_1_ssbo {
+buffer out_block_1_ssbo {
   int inner;
 } v;
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.glsl
index ad048df..a88bf80 100644
--- a/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/array/array_i32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int zero[2][3];
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_1 = 0u;
     v_1 = tint_local_index;
@@ -22,5 +22,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.glsl
index cae011b..3e1e8e3 100644
--- a/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/array/i32.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int zero[3];
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_1 = 0u;
     v_1 = tint_local_index;
@@ -22,5 +22,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.glsl
index 9375f8d..fd6c3fb 100644
--- a/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/array/u32_large.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int zero[23];
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   {
     uint v_1 = 0u;
     v_1 = tint_local_index;
@@ -22,5 +22,5 @@
 }
 layout(local_size_x = 13, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.glsl
index 177ccb5..1733f32 100644
--- a/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/array/u32_small.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int zero[3];
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 3u)) {
     zero[tint_local_index] = 0;
   }
@@ -10,5 +10,5 @@
 }
 layout(local_size_x = 10, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/matrix.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/matrix.wgsl.expected.glsl
index 6ad354f..d250c0e 100644
--- a/test/tint/var/initialization/workgroup/matrix.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/matrix.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared mat2x3 v;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     v = mat2x3(vec3(0.0f), vec3(0.0f));
   }
@@ -9,5 +9,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/scalar.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/scalar.wgsl.expected.glsl
index 5ee364a..d76a6fa 100644
--- a/test/tint/var/initialization/workgroup/scalar.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/scalar.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared int v;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     v = 0;
   }
@@ -10,5 +10,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/struct.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/struct.wgsl.expected.glsl
index 0f3f717..2674332 100644
--- a/test/tint/var/initialization/workgroup/struct.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/struct.wgsl.expected.glsl
@@ -7,7 +7,7 @@
 };
 
 shared S v;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     v = S(0, 0.0f);
   }
@@ -15,5 +15,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/initialization/workgroup/vector.wgsl.expected.glsl b/test/tint/var/initialization/workgroup/vector.wgsl.expected.glsl
index 83e42bf..ac77b48 100644
--- a/test/tint/var/initialization/workgroup/vector.wgsl.expected.glsl
+++ b/test/tint/var/initialization/workgroup/vector.wgsl.expected.glsl
@@ -1,7 +1,7 @@
 #version 310 es
 
 shared ivec3 v;
-void tint_symbol_inner(uint tint_local_index) {
+void main_inner(uint tint_local_index) {
   if ((tint_local_index < 1u)) {
     v = ivec3(0);
   }
@@ -9,5 +9,5 @@
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
-  tint_symbol_inner(gl_LocalInvocationIndex);
+  main_inner(gl_LocalInvocationIndex);
 }
diff --git a/test/tint/var/uses/instance_index.wgsl.expected.glsl b/test/tint/var/uses/instance_index.wgsl.expected.glsl
index 6d307b0..3b77c52 100644
--- a/test/tint/var/uses/instance_index.wgsl.expected.glsl
+++ b/test/tint/var/uses/instance_index.wgsl.expected.glsl
@@ -6,12 +6,12 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-vec4 tint_symbol_inner(uint b) {
+vec4 main_inner(uint b) {
   return vec4(float(b));
 }
 void main() {
   uint v = uint(gl_InstanceID);
-  gl_Position = tint_symbol_inner((v + tint_push_constants.tint_first_instance));
+  gl_Position = main_inner((v + tint_push_constants.tint_first_instance));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;
diff --git a/test/tint/var/uses/push_constant.wgsl.expected.glsl b/test/tint/var/uses/push_constant.wgsl.expected.glsl
index f6e2558..f20999d 100644
--- a/test/tint/var/uses/push_constant.wgsl.expected.glsl
+++ b/test/tint/var/uses/push_constant.wgsl.expected.glsl
@@ -4,13 +4,13 @@
 #version 310 es
 
 
-struct a_block {
+struct tint_push_constant_struct {
   int inner;
 };
 
-layout(location = 0) uniform a_block v;
+layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
 void uses_a() {
-  int foo = v.inner;
+  int foo = tint_push_constants.inner;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
@@ -22,13 +22,13 @@
 #version 310 es
 
 
-struct a_block {
+struct tint_push_constant_struct {
   int inner;
 };
 
-layout(location = 0) uniform a_block v;
+layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
 void uses_a() {
-  int foo = v.inner;
+  int foo = tint_push_constants.inner;
 }
 void uses_uses_a() {
   uses_a();
@@ -43,13 +43,13 @@
 #version 310 es
 
 
-struct b_block {
+struct tint_push_constant_struct {
   int inner;
 };
 
-layout(location = 0) uniform b_block v;
+layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
 void uses_b() {
-  int foo = v.inner;
+  int foo = tint_push_constants.inner;
 }
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main() {
diff --git a/test/tint/var/uses/push_constant_and_instance_index.wgsl.expected.glsl b/test/tint/var/uses/push_constant_and_instance_index.wgsl.expected.glsl
index 067d5b3..d7439d7 100644
--- a/test/tint/var/uses/push_constant_and_instance_index.wgsl.expected.glsl
+++ b/test/tint/var/uses/push_constant_and_instance_index.wgsl.expected.glsl
@@ -7,13 +7,13 @@
 };
 
 layout(location = 0) uniform tint_push_constant_struct tint_push_constants;
-vec4 tint_symbol_inner(uint b) {
+vec4 main_inner(uint b) {
   float v = tint_push_constants.user_constant;
   return vec4((v + float(b)));
 }
 void main() {
   uint v_1 = uint(gl_InstanceID);
-  gl_Position = tint_symbol_inner((v_1 + tint_push_constants.tint_first_instance));
+  gl_Position = main_inner((v_1 + tint_push_constants.tint_first_instance));
   gl_Position.y = -(gl_Position.y);
   gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
   gl_PointSize = 1.0f;