diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index 42fca364..51c6bc21 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -1058,7 +1058,7 @@ Id Builder::makePointerDebugType(StorageClass storageClass, Id const baseType)
     return type->getResultId();
 }
 
-// Emit a OpExtInstWithForwardRefs nonsemantic instruction for a pointer debug type
+// Emit a OpExtInstWithForwardRefsKHR nonsemantic instruction for a pointer debug type
 // where we don't have the pointee yet. Since we don't have the pointee yet, it just
 // points to itself and we rely on patching it later.
 Id Builder::makeForwardPointerDebugType(StorageClass storageClass)
@@ -1067,7 +1067,7 @@ Id Builder::makeForwardPointerDebugType(StorageClass storageClass)
 
     this->addExtension(spv::E_SPV_KHR_relaxed_extended_instruction);
 
-    Instruction *type = new Instruction(getUniqueId(), makeVoidType(), OpExtInstWithForwardRefs);
+    Instruction *type = new Instruction(getUniqueId(), makeVoidType(), OpExtInstWithForwardRefsKHR);
     type->addIdOperand(nonSemanticShaderDebugInfo);
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypePointer);
     type->addIdOperand(type->getResultId());
diff --git a/SPIRV/doc.cpp b/SPIRV/doc.cpp
index 141fb5b7..de465e1d 100755
--- a/SPIRV/doc.cpp
+++ b/SPIRV/doc.cpp
@@ -1445,7 +1445,7 @@ const char* OpcodeString(int op)
     case 4429: return "OpSubgroupAnyKHR";
     case 4430: return "OpSubgroupAllEqualKHR";
     case 4432: return "OpSubgroupReadInvocationKHR";
-    case 4433: return "OpExtInstWithForwardRefs";
+    case 4433: return "OpExtInstWithForwardRefsKHR";
 
     case OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
     case OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
@@ -1897,9 +1897,9 @@ void Parameterize()
         InstructionDesc[OpExtInst].operands.push(OperandLiteralNumber, "'Instruction'");
         InstructionDesc[OpExtInst].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
 
-        InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandId, "'Set'");
-        InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandLiteralNumber, "'Instruction'");
-        InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
+        InstructionDesc[OpExtInstWithForwardRefsKHR].operands.push(OperandId, "'Set'");
+        InstructionDesc[OpExtInstWithForwardRefsKHR].operands.push(OperandLiteralNumber, "'Instruction'");
+        InstructionDesc[OpExtInstWithForwardRefsKHR].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
 
         InstructionDesc[OpLoad].operands.push(OperandId, "'Pointer'");
         InstructionDesc[OpLoad].operands.push(OperandMemoryAccess, "", true);
diff --git a/SPIRV/spirv.hpp b/SPIRV/spirv.hpp
index 0d93ba96..bb3d715e 100644
--- a/SPIRV/spirv.hpp
+++ b/SPIRV/spirv.hpp
@@ -1668,7 +1668,7 @@ enum Op {
     OpSubgroupAllEqualKHR = 4430,
     OpGroupNonUniformRotateKHR = 4431,
     OpSubgroupReadInvocationKHR = 4432,
-    OpExtInstWithForwardRefs = 4433,
+    OpExtInstWithForwardRefsKHR = 4433,
     OpTraceRayKHR = 4445,
     OpExecuteCallableKHR = 4446,
     OpConvertUToAccelerationStructureKHR = 4447,
@@ -2396,7 +2396,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpPtrEqual: *hasResult = true; *hasResultType = true; break;
     case OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
     case OpPtrDiff: *hasResult = true; *hasResultType = true; break;
-    case OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
+    case OpExtInstWithForwardRefsKHR: *hasResult = true; *hasResultType = true; break;
     case OpColorAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
     case OpDepthAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
     case OpStencilAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
diff --git a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
index 6b877bf5..c47f0e66 100644
--- a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
@@ -112,7 +112,7 @@ void main() {
               17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
                               TypeForwardPointer 28 PhysicalStorageBufferEXT
               29:      7(int) Constant 5349
-              30:           4 ExtInstWithForwardRefs 1(NonSemantic.Shader.DebugInfo.100) 3 48 29 12
+              30:           4 ExtInstWithForwardRefsKHR 1(NonSemantic.Shader.DebugInfo.100) 3 48 29 12
         31(Mesh):             TypeStruct 28
               34:      7(int) Constant 9
               35:      7(int) Constant 23
diff --git a/known_good.json b/known_good.json
index a87331c8..c6de6b18 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit": "6a2bdeee75eb35e5349c6993d33c9afe30237d79"
+      "commit": "ce46482db7ab3ea9c52fce832d27ca40b14f8e87"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "ff2afc3afc48dff4eec2a10f0212402a80708e38"
+      "commit" : "eb49bb7b1136298b77945c52b4bbbc433f7885de"
     },
     {
       "name": "googletest",