diff --git a/util/test/tests/Vulkan/VK_Indirect.py b/util/test/tests/Vulkan/VK_Indirect.py
index 5f8a9c750..3db15f8f9 100644
--- a/util/test/tests/Vulkan/VK_Indirect.py
+++ b/util/test/tests/Vulkan/VK_Indirect.py
@@ -215,9 +215,9 @@ class VK_Indirect(rdtest.TestCase):
             postvs_data = self.get_postvs(rd.MeshDataStage.VSOut)
 
             postvs_ref = {
-                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.8, -0.5, 0.0, 1.0]},
-                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.7, -0.8, 0.0, 1.0]},
-                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.6, -0.5, 0.0, 1.0]},
+                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.8, -0.5, 0.0, 1.0]},
+                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.7, -0.8, 0.0, 1.0]},
+                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.6, -0.5, 0.0, 1.0]},
             }
 
             self.check_mesh_data(postvs_ref, postvs_data)
@@ -242,9 +242,9 @@ class VK_Indirect(rdtest.TestCase):
             # These indices are the *output* indices, which have been rebased/remapped, so are not the same as the input
             # indices
             postvs_ref = {
-                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.6, -0.5, 0.0, 1.0]},
-                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.5, -0.8, 0.0, 1.0]},
-                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.4, -0.5, 0.0, 1.0]},
+                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.6, -0.5, 0.0, 1.0]},
+                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.5, -0.8, 0.0, 1.0]},
+                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.4, -0.5, 0.0, 1.0]},
             }
 
             self.check_mesh_data(postvs_ref, postvs_data)
@@ -265,13 +265,13 @@ class VK_Indirect(rdtest.TestCase):
             postvs_data = self.get_postvs(rd.MeshDataStage.VSOut)
 
             postvs_ref = {
-                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.4, -0.5, 0.0, 1.0]},
-                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.3, -0.8, 0.0, 1.0]},
-                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.2, -0.8, 0.0, 1.0]},
+                0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.4, -0.5, 0.0, 1.0]},
+                1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.3, -0.8, 0.0, 1.0]},
+                2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.2, -0.8, 0.0, 1.0]},
 
-                3: {'vtx': 3, 'idx': 3, 'gl_PerVertex.gl_Position': [-0.1, -0.5, 0.0, 1.0]},
-                4: {'vtx': 4, 'idx': 4, 'gl_PerVertex.gl_Position': [ 0.0, -0.8, 0.0, 1.0]},
-                5: {'vtx': 5, 'idx': 5, 'gl_PerVertex.gl_Position': [ 0.1, -0.8, 0.0, 1.0]},
+                3: {'vtx': 3, 'idx': 3, 'gl_PerVertex_var.gl_Position': [-0.1, -0.5, 0.0, 1.0]},
+                4: {'vtx': 4, 'idx': 4, 'gl_PerVertex_var.gl_Position': [ 0.0, -0.8, 0.0, 1.0]},
+                5: {'vtx': 5, 'idx': 5, 'gl_PerVertex_var.gl_Position': [ 0.1, -0.8, 0.0, 1.0]},
             }
 
             self.check_mesh_data(postvs_ref, postvs_data)
@@ -323,9 +323,9 @@ class VK_Indirect(rdtest.TestCase):
                 # These indices are the *output* indices, which have been rebased/remapped, so are not the same as the input
                 # indices
                 postvs_ref = {
-                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.8, 0.5, 0.0, 1.0]},
-                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.7, 0.2, 0.0, 1.0]},
-                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.6, 0.5, 0.0, 1.0]},
+                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.8, 0.5, 0.0, 1.0]},
+                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.7, 0.2, 0.0, 1.0]},
+                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.6, 0.5, 0.0, 1.0]},
                 }
 
                 self.check_mesh_data(postvs_ref, postvs_data)
@@ -353,9 +353,9 @@ class VK_Indirect(rdtest.TestCase):
                 # These indices are the *output* indices, which have been rebased/remapped, so are not the same as the input
                 # indices
                 postvs_ref = {
-                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.6, 0.5, 0.0, 1.0]},
-                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.5, 0.2, 0.0, 1.0]},
-                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.4, 0.5, 0.0, 1.0]},
+                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.6, 0.5, 0.0, 1.0]},
+                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.5, 0.2, 0.0, 1.0]},
+                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.4, 0.5, 0.0, 1.0]},
                 }
 
                 self.check_mesh_data(postvs_ref, postvs_data)
@@ -393,13 +393,13 @@ class VK_Indirect(rdtest.TestCase):
                 # These indices are the *output* indices, which have been rebased/remapped, so are not the same as the input
                 # indices
                 postvs_ref = {
-                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex.gl_Position': [-0.4, 0.5, 0.0, 1.0]},
-                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex.gl_Position': [-0.3, 0.2, 0.0, 1.0]},
-                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex.gl_Position': [-0.2, 0.2, 0.0, 1.0]},
+                    0: {'vtx': 0, 'idx': 0, 'gl_PerVertex_var.gl_Position': [-0.4, 0.5, 0.0, 1.0]},
+                    1: {'vtx': 1, 'idx': 1, 'gl_PerVertex_var.gl_Position': [-0.3, 0.2, 0.0, 1.0]},
+                    2: {'vtx': 2, 'idx': 2, 'gl_PerVertex_var.gl_Position': [-0.2, 0.2, 0.0, 1.0]},
 
-                    3: {'vtx': 3, 'idx': 3, 'gl_PerVertex.gl_Position': [-0.1, 0.5, 0.0, 1.0]},
-                    4: {'vtx': 4, 'idx': 4, 'gl_PerVertex.gl_Position': [ 0.0, 0.2, 0.0, 1.0]},
-                    5: {'vtx': 5, 'idx': 5, 'gl_PerVertex.gl_Position': [ 0.1, 0.2, 0.0, 1.0]},
+                    3: {'vtx': 3, 'idx': 3, 'gl_PerVertex_var.gl_Position': [-0.1, 0.5, 0.0, 1.0]},
+                    4: {'vtx': 4, 'idx': 4, 'gl_PerVertex_var.gl_Position': [ 0.0, 0.2, 0.0, 1.0]},
+                    5: {'vtx': 5, 'idx': 5, 'gl_PerVertex_var.gl_Position': [ 0.1, 0.2, 0.0, 1.0]},
                 }
 
                 self.check_mesh_data(postvs_ref, postvs_data)
diff --git a/util/test/tests/Vulkan/VK_Int8_IBuffer.py b/util/test/tests/Vulkan/VK_Int8_IBuffer.py
index 905057be0..cc44c9fae 100644
--- a/util/test/tests/Vulkan/VK_Int8_IBuffer.py
+++ b/util/test/tests/Vulkan/VK_Int8_IBuffer.py
@@ -24,14 +24,14 @@ class VK_Int8_IBuffer(rdtest.TestCase):
             0: {
                 'vtx': 0,
                 'idx': 0,
-                'gl_PerVertex.gl_Position': [-0.8, -0.2, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [-0.8, -0.2, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 0.0, 0.0, 1.0],
             },
             4: {
                 'vtx': 4,
                 'idx': 4,
-                'gl_PerVertex.gl_Position': [0.0, -0.2, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.0, -0.2, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 0.0, 0.0, 1.0],
             },
@@ -41,7 +41,7 @@ class VK_Int8_IBuffer(rdtest.TestCase):
             9: {
                 'vtx': 9,
                 'idx': 8,
-                'gl_PerVertex.gl_Position': [-0.8, 0.7, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [-0.8, 0.7, 0.0, 1.0],
                 'vertOut.col': [0.0, 0.0, 1.0, 1.0],
                 'vertOut.uv': [0.0, 0.0, 0.0, 1.0],
             },
diff --git a/util/test/tests/Vulkan/VK_Large_Buffer.py b/util/test/tests/Vulkan/VK_Large_Buffer.py
index a4b8e654f..223954abc 100644
--- a/util/test/tests/Vulkan/VK_Large_Buffer.py
+++ b/util/test/tests/Vulkan/VK_Large_Buffer.py
@@ -42,7 +42,7 @@ class VK_Large_Buffer(rdtest.TestCase):
             0: {
                 'vtx': 0,
                 'idx': 0,
-                'gl_PerVertex.gl_Position': [-0.5, 0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [-0.5, 0.5, 0.0, 1.0],
                 'vertOut.pos': [-0.5, 0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 0.0, 0.0, 1.0],
@@ -50,7 +50,7 @@ class VK_Large_Buffer(rdtest.TestCase):
             1: {
                 'vtx': 1,
                 'idx': 1,
-                'gl_PerVertex.gl_Position': [0.0, -0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.0, -0.5, 0.0, 1.0],
                 'vertOut.pos': [0.0, -0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 1.0, 0.0, 1.0],
@@ -58,7 +58,7 @@ class VK_Large_Buffer(rdtest.TestCase):
             2: {
                 'vtx': 2,
                 'idx': 2,
-                'gl_PerVertex.gl_Position': [0.5, 0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.5, 0.5, 0.0, 1.0],
                 'vertOut.pos': [0.5, 0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [1.0, 0.0, 0.0, 1.0],
diff --git a/util/test/tests/Vulkan/VK_Misaligned_Dirty.py b/util/test/tests/Vulkan/VK_Misaligned_Dirty.py
index 3893298e8..d8ae4b7b5 100644
--- a/util/test/tests/Vulkan/VK_Misaligned_Dirty.py
+++ b/util/test/tests/Vulkan/VK_Misaligned_Dirty.py
@@ -29,19 +29,19 @@ class VK_Misaligned_Dirty(rdtest.TestCase):
             0: {
                 'vtx': 0,
                 'idx': 0,
-                'gl_PerVertex.gl_Position': [-val, val, val, 1.0],
+                'gl_PerVertex_var.gl_Position': [-val, val, val, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
             },
             1: {
                 'vtx': 1,
                 'idx': 1,
-                'gl_PerVertex.gl_Position': [0.0, -val, val, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.0, -val, val, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
             },
             2: {
                 'vtx': 2,
                 'idx': 2,
-                'gl_PerVertex.gl_Position': [val, val, val, 1.0],
+                'gl_PerVertex_var.gl_Position': [val, val, val, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
             },
         }
diff --git a/util/test/tests/Vulkan/VK_Simple_Triangle.py b/util/test/tests/Vulkan/VK_Simple_Triangle.py
index dac5a199a..cc141f3de 100644
--- a/util/test/tests/Vulkan/VK_Simple_Triangle.py
+++ b/util/test/tests/Vulkan/VK_Simple_Triangle.py
@@ -24,7 +24,7 @@ class VK_Simple_Triangle(rdtest.TestCase):
             0: {
                 'vtx': 0,
                 'idx': 0,
-                'gl_PerVertex.gl_Position': [-0.5, 0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [-0.5, 0.5, 0.0, 1.0],
                 'vertOut.pos': [-0.5, 0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 0.0, 0.0, 1.0],
@@ -32,7 +32,7 @@ class VK_Simple_Triangle(rdtest.TestCase):
             1: {
                 'vtx': 1,
                 'idx': 1,
-                'gl_PerVertex.gl_Position': [0.0, -0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.0, -0.5, 0.0, 1.0],
                 'vertOut.pos': [0.0, -0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [0.0, 1.0, 0.0, 1.0],
@@ -40,7 +40,7 @@ class VK_Simple_Triangle(rdtest.TestCase):
             2: {
                 'vtx': 2,
                 'idx': 2,
-                'gl_PerVertex.gl_Position': [0.5, 0.5, 0.0, 1.0],
+                'gl_PerVertex_var.gl_Position': [0.5, 0.5, 0.0, 1.0],
                 'vertOut.pos': [0.5, 0.5, 0.0, 1.0],
                 'vertOut.col': [0.0, 1.0, 0.0, 1.0],
                 'vertOut.uv': [1.0, 0.0, 0.0, 1.0],
diff --git a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
index e37959b79..347fbbba7 100644
--- a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
@@ -76,14 +76,14 @@ class VK_Vertex_Attr_Zoo(rdtest.TestCase):
         vsout_ref = copy.deepcopy(out_ref)
         gsout_ref = out_ref
 
-        vsout_ref[0]['gl_PerVertex.gl_Position'] = [-0.5, 0.5, 0.0, 1.0]
-        gsout_ref[0]['gl_PerVertex.gl_Position'] = [0.5, -0.5, 0.4, 1.2]
+        vsout_ref[0]['gl_PerVertex_var.gl_Position'] = [-0.5, 0.5, 0.0, 1.0]
+        gsout_ref[0]['gl_PerVertex_var.gl_Position'] = [0.5, -0.5, 0.4, 1.2]
 
-        vsout_ref[1]['gl_PerVertex.gl_Position'] = [0.0, -0.5, 0.0, 1.0]
-        gsout_ref[1]['gl_PerVertex.gl_Position'] = [-0.5, 0.0, 0.4, 1.2]
+        vsout_ref[1]['gl_PerVertex_var.gl_Position'] = [0.0, -0.5, 0.0, 1.0]
+        gsout_ref[1]['gl_PerVertex_var.gl_Position'] = [-0.5, 0.0, 0.4, 1.2]
 
-        vsout_ref[2]['gl_PerVertex.gl_Position'] = [0.5, 0.5, 0.0, 1.0]
-        gsout_ref[2]['gl_PerVertex.gl_Position'] = [0.5, 0.5, 0.4, 1.2]
+        vsout_ref[2]['gl_PerVertex_var.gl_Position'] = [0.5, 0.5, 0.0, 1.0]
+        gsout_ref[2]['gl_PerVertex_var.gl_Position'] = [0.5, 0.5, 0.4, 1.2]
 
         self.check_mesh_data(in_ref, self.get_vsin(draw))
         rdtest.log.success("Vertex input data is as expected")