diff --git a/include/spirv/unified1/NonSemanticVkspReflection.h b/include/spirv/unified1/NonSemanticVkspReflection.h
index e50ae4898..af4a556e5 100644
--- a/include/spirv/unified1/NonSemanticVkspReflection.h
+++ b/include/spirv/unified1/NonSemanticVkspReflection.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 enum {
-    NonSemanticVkspReflectionRevision = 3,
+    NonSemanticVkspReflectionRevision = 4,
     NonSemanticVkspReflectionRevision_BitWidthPadding = 0x7fffffff
 };
 
diff --git a/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json b/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
index 74eb57b8a..0bc12d60d 100644
--- a/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
+++ b/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
@@ -1,26 +1,26 @@
 {
-  "revision" : 3,
+  "revision" : 4,
   "instructions" : [
     {
       "opname" : "Configuration",
       "opcode" : 1,
       "operands" : [
-        {"kind" : "LiteralString", "name" : "enabledExtensionNames" },
-        {"kind" : "LiteralInteger", "name" : "specializationInfoDataSize" },
-        {"kind" : "LiteralString", "name" : "specializationInfoData" },
-        {"kind" : "LiteralString", "name" : "shaderName" },
-        {"kind" : "LiteralString", "name" : "EntryPoint" },
-        {"kind" : "LiteralInteger", "name" : "groupCountX" },
-        {"kind" : "LiteralInteger", "name" : "groupCountY" },
-        {"kind" : "LiteralInteger", "name" : "groupCountZ" },
-        {"kind" : "LiteralInteger", "name" : "dispatchId" }
+        {"kind" : "IdRef", "name" : "enabledExtensionNames" },
+        {"kind" : "IdRef", "name" : "specializationInfoDataSize" },
+        {"kind" : "IdRef", "name" : "specializationInfoData" },
+        {"kind" : "IdRef", "name" : "shaderName" },
+        {"kind" : "IdRef", "name" : "EntryPoint" },
+        {"kind" : "IdRef", "name" : "groupCountX" },
+        {"kind" : "IdRef", "name" : "groupCountY" },
+        {"kind" : "IdRef", "name" : "groupCountZ" },
+        {"kind" : "IdRef", "name" : "dispatchId" }
       ]
     },
     {
       "opname" : "StartCounter",
       "opcode" : 2,
       "operands" : [
-        {"kind" : "LiteralString", "name" : "name" }
+        {"kind" : "IdRef", "name" : "name" }
       ]
     },
     {
@@ -34,104 +34,104 @@
       "opname" : "PushConstants",
       "opcode" : 4,
       "operands" : [
-        { "kind" : "LiteralInteger", "name" : "offset" },
-        { "kind" : "LiteralInteger", "name" : "size" },
-        { "kind" : "LiteralString", "name" : "pValues" },
-        { "kind" : "LiteralInteger", "name" : "stageFlags" }
+        { "kind" : "IdRef", "name" : "offset" },
+        { "kind" : "IdRef", "name" : "size" },
+        { "kind" : "IdRef", "name" : "pValues" },
+        { "kind" : "IdRef", "name" : "stageFlags" }
       ]
     },
     {
       "opname" : "SpecializationMapEntry",
       "opcode" : 5,
       "operands" : [
-        {"kind" : "LiteralInteger", "name" : "constantID" },
-        {"kind" : "LiteralInteger", "name" : "offset" },
-        {"kind" : "LiteralInteger", "name" : "size" }
+        {"kind" : "IdRef", "name" : "constantID" },
+        {"kind" : "IdRef", "name" : "offset" },
+        {"kind" : "IdRef", "name" : "size" }
       ]
     },
     {
       "opname" : "DescriptorSetBuffer",
       "opcode" : 6,
       "operands" : [
-        { "kind" : "LiteralInteger", "name" : "ds" },
-        { "kind" : "LiteralInteger", "name" : "binding" },
-        { "kind" : "LiteralInteger", "name" : "type" },
-        { "kind" : "LiteralInteger", "name" : "flags" },
-        { "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount" },
-        { "kind" : "LiteralInteger", "name" : "sharingMode" },
-        { "kind" : "LiteralInteger", "name" : "size" },
-        { "kind" : "LiteralInteger", "name" : "usage" },
-        { "kind" : "LiteralInteger", "name" : "range" },
-        { "kind" : "LiteralInteger", "name" : "offset" },
-        { "kind" : "LiteralInteger", "name" : "memorySize" },
-        { "kind" : "LiteralInteger", "name" : "memoryType" },
-        { "kind" : "LiteralInteger", "name" : "bindOffset" },
-        { "kind" : "LiteralInteger", "name" : "viewFlags" },
-        { "kind" : "LiteralInteger", "name" : "viewFormat" }
+        { "kind" : "IdRef", "name" : "ds" },
+        { "kind" : "IdRef", "name" : "binding" },
+        { "kind" : "IdRef", "name" : "type" },
+        { "kind" : "IdRef", "name" : "flags" },
+        { "kind" : "IdRef", "name" : "queueFamilyIndexCount" },
+        { "kind" : "IdRef", "name" : "sharingMode" },
+        { "kind" : "IdRef", "name" : "size" },
+        { "kind" : "IdRef", "name" : "usage" },
+        { "kind" : "IdRef", "name" : "range" },
+        { "kind" : "IdRef", "name" : "offset" },
+        { "kind" : "IdRef", "name" : "memorySize" },
+        { "kind" : "IdRef", "name" : "memoryType" },
+        { "kind" : "IdRef", "name" : "bindOffset" },
+        { "kind" : "IdRef", "name" : "viewFlags" },
+        { "kind" : "IdRef", "name" : "viewFormat" }
       ]
     },
     {
       "opname" : "DescriptorSetImage",
       "opcode" : 7,
       "operands" : [
-        { "kind" : "LiteralInteger", "name" : "ds" },
-        { "kind" : "LiteralInteger", "name" : "binding" },
-        { "kind" : "LiteralInteger", "name" : "type" },
-        { "kind" : "LiteralInteger", "name" : "imageLayout"},
-        { "kind" : "LiteralInteger", "name" : "imageFlags"},
-        { "kind" : "LiteralInteger", "name" : "imageType"},
-        { "kind" : "LiteralInteger", "name" : "imageformat"},
-        { "kind" : "LiteralInteger", "name" : "width"},
-        { "kind" : "LiteralInteger", "name" : "height"},
-        { "kind" : "LiteralInteger", "name" : "depth"},
-        { "kind" : "LiteralInteger", "name" : "mipLevels"},
-        { "kind" : "LiteralInteger", "name" : "arrayLayers"},
-        { "kind" : "LiteralInteger", "name" : "samples"},
-        { "kind" : "LiteralInteger", "name" : "tiling"},
-        { "kind" : "LiteralInteger", "name" : "usage"},
-        { "kind" : "LiteralInteger", "name" : "sharingMode"},
-        { "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount"},
-        { "kind" : "LiteralInteger", "name" : "initialLayout"},
-        { "kind" : "LiteralInteger", "name" : "aspectMask"},
-        { "kind" : "LiteralInteger", "name" : "baseMipLevel"},
-        { "kind" : "LiteralInteger", "name" : "levelCount"},
-        { "kind" : "LiteralInteger", "name" : "baseArrayLayer"},
-        { "kind" : "LiteralInteger", "name" : "layerCount"},
-        { "kind" : "LiteralInteger", "name" : "viewFlags"},
-        { "kind" : "LiteralInteger", "name" : "viewType"},
-        { "kind" : "LiteralInteger", "name" : "viewFormat"},
-        { "kind" : "LiteralInteger", "name" : "component_a"},
-        { "kind" : "LiteralInteger", "name" : "component_b"},
-        { "kind" : "LiteralInteger", "name" : "component_g"},
-        { "kind" : "LiteralInteger", "name" : "component_r"},
-        { "kind" : "LiteralInteger", "name" : "memorySize" },
-        { "kind" : "LiteralInteger", "name" : "memoryType" },
-        { "kind" : "LiteralInteger", "name" : "bindOffset"}
+        { "kind" : "IdRef", "name" : "ds" },
+        { "kind" : "IdRef", "name" : "binding" },
+        { "kind" : "IdRef", "name" : "type" },
+        { "kind" : "IdRef", "name" : "imageLayout"},
+        { "kind" : "IdRef", "name" : "imageFlags"},
+        { "kind" : "IdRef", "name" : "imageType"},
+        { "kind" : "IdRef", "name" : "imageformat"},
+        { "kind" : "IdRef", "name" : "width"},
+        { "kind" : "IdRef", "name" : "height"},
+        { "kind" : "IdRef", "name" : "depth"},
+        { "kind" : "IdRef", "name" : "mipLevels"},
+        { "kind" : "IdRef", "name" : "arrayLayers"},
+        { "kind" : "IdRef", "name" : "samples"},
+        { "kind" : "IdRef", "name" : "tiling"},
+        { "kind" : "IdRef", "name" : "usage"},
+        { "kind" : "IdRef", "name" : "sharingMode"},
+        { "kind" : "IdRef", "name" : "queueFamilyIndexCount"},
+        { "kind" : "IdRef", "name" : "initialLayout"},
+        { "kind" : "IdRef", "name" : "aspectMask"},
+        { "kind" : "IdRef", "name" : "baseMipLevel"},
+        { "kind" : "IdRef", "name" : "levelCount"},
+        { "kind" : "IdRef", "name" : "baseArrayLayer"},
+        { "kind" : "IdRef", "name" : "layerCount"},
+        { "kind" : "IdRef", "name" : "viewFlags"},
+        { "kind" : "IdRef", "name" : "viewType"},
+        { "kind" : "IdRef", "name" : "viewFormat"},
+        { "kind" : "IdRef", "name" : "component_a"},
+        { "kind" : "IdRef", "name" : "component_b"},
+        { "kind" : "IdRef", "name" : "component_g"},
+        { "kind" : "IdRef", "name" : "component_r"},
+        { "kind" : "IdRef", "name" : "memorySize" },
+        { "kind" : "IdRef", "name" : "memoryType" },
+        { "kind" : "IdRef", "name" : "bindOffset"}
       ]
     },
     {
       "opname" : "DescriptorSetSampler",
       "opcode" : 8,
       "operands" : [
-        { "kind" : "LiteralInteger", "name" : "ds" },
-        { "kind" : "LiteralInteger", "name" : "binding" },
-        { "kind" : "LiteralInteger", "name" : "type" },
-        { "kind" : "LiteralInteger", "name" : "flags"},
-        { "kind" : "LiteralInteger", "name" : "magFilter"},
-        { "kind" : "LiteralInteger", "name" : "minFilter"},
-        { "kind" : "LiteralInteger", "name" : "mipmapMode"},
-        { "kind" : "LiteralInteger", "name" : "addressModeU"},
-        { "kind" : "LiteralInteger", "name" : "addressModeV"},
-        { "kind" : "LiteralInteger", "name" : "addressModeW"},
-        { "kind" : "LiteralFloat", "name" : "mipLodBias"},
-        { "kind" : "LiteralInteger", "name" : "anisotropyEnable"},
-        { "kind" : "LiteralFloat", "name" : "maxAnisotropy"},
-        { "kind" : "LiteralInteger", "name" : "compareEnable"},
-        { "kind" : "LiteralInteger", "name" : "compareOp"},
-        { "kind" : "LiteralFloat", "name" : "minLod"},
-        { "kind" : "LiteralFloat", "name" : "maxLod"},
-        { "kind" : "LiteralInteger", "name" : "borderColor"},
-        { "kind" : "LiteralInteger", "name" : "unnormalizedCoordinates"}
+        { "kind" : "IdRef", "name" : "ds" },
+        { "kind" : "IdRef", "name" : "binding" },
+        { "kind" : "IdRef", "name" : "type" },
+        { "kind" : "IdRef", "name" : "flags"},
+        { "kind" : "IdRef", "name" : "magFilter"},
+        { "kind" : "IdRef", "name" : "minFilter"},
+        { "kind" : "IdRef", "name" : "mipmapMode"},
+        { "kind" : "IdRef", "name" : "addressModeU"},
+        { "kind" : "IdRef", "name" : "addressModeV"},
+        { "kind" : "IdRef", "name" : "addressModeW"},
+        { "kind" : "IdRef", "name" : "mipLodBias"},
+        { "kind" : "IdRef", "name" : "anisotropyEnable"},
+        { "kind" : "IdRef", "name" : "maxAnisotropy"},
+        { "kind" : "IdRef", "name" : "compareEnable"},
+        { "kind" : "IdRef", "name" : "compareOp"},
+        { "kind" : "IdRef", "name" : "minLod"},
+        { "kind" : "IdRef", "name" : "maxLod"},
+        { "kind" : "IdRef", "name" : "borderColor"},
+        { "kind" : "IdRef", "name" : "unnormalizedCoordinates"}
       ]
     }
   ]