diff --git a/Test/baseResults/120.frag.out b/Test/baseResults/120.frag.out
index 8909f16..835cd9e 100644
--- a/Test/baseResults/120.frag.out
+++ b/Test/baseResults/120.frag.out
@@ -54,8 +54,8 @@
 ERROR: 0:245: ':' :  wrong operand types: no operation ':' exists that takes a left-hand operand of type ' const int' and a right operand of type ' global void' (or there is no acceptable conversion)
 ERROR: 0:248: 'half floating-point suffix' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:248: '' :  syntax error, unexpected IDENTIFIER, expecting COMMA or SEMICOLON
 ERROR: 55 compilation errors.  No code generated.
 
diff --git a/Test/baseResults/constantUnaryConversion.comp.out b/Test/baseResults/constantUnaryConversion.comp.out
index de705e4..4117e93 100644
--- a/Test/baseResults/constantUnaryConversion.comp.out
+++ b/Test/baseResults/constantUnaryConversion.comp.out
@@ -1,6 +1,6 @@
 constantUnaryConversion.comp
 Shader version: 450
-Requested GL_KHX_shader_explicit_arithmetic_types
+Requested GL_EXT_shader_explicit_arithmetic_types
 local_size = (1, 1, 1)
 0:? Sequence
 0:48  Function Definition: main( ( global void)
@@ -324,7 +324,7 @@
 
 
 Shader version: 450
-Requested GL_KHX_shader_explicit_arithmetic_types
+Requested GL_EXT_shader_explicit_arithmetic_types
 local_size = (1, 1, 1)
 0:? Sequence
 0:48  Function Definition: main( ( global void)
diff --git a/Test/baseResults/findFunction.frag.out b/Test/baseResults/findFunction.frag.out
index ec4f3e4..cc9b15a 100644
--- a/Test/baseResults/findFunction.frag.out
+++ b/Test/baseResults/findFunction.frag.out
@@ -11,7 +11,7 @@
 
 
 Shader version: 450
-Requested GL_KHX_shader_explicit_arithmetic_types
+Requested GL_EXT_shader_explicit_arithmetic_types
 ERROR: node is still EOpNull!
 0:5  Function Definition: func(i81;i161;i161; ( global int64_t)
 0:5    Function Parameters: 
@@ -137,7 +137,7 @@
 
 
 Shader version: 450
-Requested GL_KHX_shader_explicit_arithmetic_types
+Requested GL_EXT_shader_explicit_arithmetic_types
 ERROR: node is still EOpNull!
 0:10  Function Definition: func(i81;i161;i1; ( global int64_t)
 0:10    Function Parameters: 
diff --git a/Test/baseResults/spv.16bitstorage_Error-int.frag.out b/Test/baseResults/spv.16bitstorage_Error-int.frag.out
index 4055258..d6a0c13 100644
--- a/Test/baseResults/spv.16bitstorage_Error-int.frag.out
+++ b/Test/baseResults/spv.16bitstorage_Error-int.frag.out
@@ -1,88 +1,88 @@
 spv.16bitstorage_Error-int.frag
 ERROR: 0:54: 'structure: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:58: 'return: can't use with structs containing int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:61: 'int16_t: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:74: '[: does not operate on types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:75: '.: can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:77: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:77: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int16_t' (or there is no acceptable conversion)
 ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform int16_t (or there is no acceptable conversion)
 ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type ' const int' (or there is no acceptable conversion)
 ERROR: 0:81: '.: can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:82: '=: can't use with structs containing int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:83: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:84: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:85: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int16_t' (or there is no acceptable conversion)
 ERROR: 0:87: '=: can't use with arrays containing int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:88: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:89: 'constructor: 16-bit arrays not supported' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:89: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:92: 'constructor: can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:93: 'func2' : no matching overloaded function found 
 ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
 ERROR: 26 compilation errors.  No code generated.
diff --git a/Test/baseResults/spv.16bitstorage_Error-uint.frag.out b/Test/baseResults/spv.16bitstorage_Error-uint.frag.out
index bff46d4..bac902e 100644
--- a/Test/baseResults/spv.16bitstorage_Error-uint.frag.out
+++ b/Test/baseResults/spv.16bitstorage_Error-uint.frag.out
@@ -1,88 +1,88 @@
 spv.16bitstorage_Error-uint.frag
 ERROR: 0:54: 'structure: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:58: 'return: can't use with structs containing uint16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:61: 'uint16_t: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:74: '[: does not operate on types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:75: '.: can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:76: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:77: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:77: 'built-in function: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint16_t' (or there is no acceptable conversion)
 ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform uint16_t (or there is no acceptable conversion)
 ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type ' const int' (or there is no acceptable conversion)
 ERROR: 0:81: '.: can't swizzle types containing (u)int16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:82: '=: can't use with structs containing uint16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:83: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:84: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:85: 'qualifier: (u)int16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint16_t' (or there is no acceptable conversion)
 ERROR: 0:87: '=: can't use with arrays containing uint16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:88: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:89: 'constructor: 16-bit arrays not supported' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:89: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:92: 'constructor: can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_int16
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int16
 ERROR: 0:93: 'func2' : no matching overloaded function found 
 ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
 ERROR: 26 compilation errors.  No code generated.
diff --git a/Test/baseResults/spv.16bitstorage_Error.frag.out b/Test/baseResults/spv.16bitstorage_Error.frag.out
index 08c75e7..8e7e35e 100644
--- a/Test/baseResults/spv.16bitstorage_Error.frag.out
+++ b/Test/baseResults/spv.16bitstorage_Error.frag.out
@@ -1,96 +1,96 @@
 spv.16bitstorage_Error.frag
 ERROR: 0:54: 'structure: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:58: 'return: can't use with structs containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:61: 'float16_t: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:74: '[: does not operate on types containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:75: '.: can't swizzle types containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:76: 'built-in function: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:76: 'built-in function: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:76: 'built-in function: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:77: 'built-in function: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:77: 'built-in function: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform float16_t' (or there is no acceptable conversion)
 ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform float16_t (or there is no acceptable conversion)
 ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type ' const float' (or there is no acceptable conversion)
 ERROR: 0:81: '.: can't swizzle types containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:82: '=: can't use with structs containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:83: 'qualifier: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:84: 'qualifier: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:85: 'qualifier: float16 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform float16_t' and a right operand of type 'layout( column_major std140 offset=0) uniform float16_t' (or there is no acceptable conversion)
 ERROR: 0:87: '=: can't use with arrays containing float16' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:88: 'half floating-point suffix' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:88: 'half float literal' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:89: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:90: 'constructor: 16-bit arrays not supported' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:90: 'constructor: 16-bit vectors only take vector types' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:93: 'constructor: can't construct structure containing 16-bit type' : required extension not requested: Possible extensions include:
 GL_AMD_gpu_shader_half_float
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_float16
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_float16
 ERROR: 0:94: 'func2' : no matching overloaded function found 
 ERROR: 0:100: '' :  syntax error, unexpected IDENTIFIER
 ERROR: 28 compilation errors.  No code generated.
diff --git a/Test/baseResults/spv.8bitstorage_Error-int.frag.out b/Test/baseResults/spv.8bitstorage_Error-int.frag.out
index 0562111..5607670 100644
--- a/Test/baseResults/spv.8bitstorage_Error-int.frag.out
+++ b/Test/baseResults/spv.8bitstorage_Error-int.frag.out
@@ -1,68 +1,68 @@
 spv.8bitstorage_Error-int.frag
 ERROR: 0:54: 'structure: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:58: 'return: can't use with structs containing int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:61: 'int8_t: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:74: '[: does not operate on types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:75: '.: can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:77: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:77: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int8_t' (or there is no acceptable conversion)
 ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform int8_t (or there is no acceptable conversion)
 ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type ' const int' (or there is no acceptable conversion)
 ERROR: 0:81: '.: can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:82: '=: can't use with structs containing int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:83: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:84: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:85: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform int8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform int8_t' (or there is no acceptable conversion)
 ERROR: 0:87: '=: can't use with arrays containing int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:88: 'constructor: 8-bit vectors only take vector types' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:89: 'constructor: 8-bit arrays not supported' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:89: 'constructor: 8-bit vectors only take vector types' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:92: 'constructor: can't construct structure containing 8-bit type' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:93: 'func2' : no matching overloaded function found 
 ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
 ERROR: 26 compilation errors.  No code generated.
diff --git a/Test/baseResults/spv.8bitstorage_Error-uint.frag.out b/Test/baseResults/spv.8bitstorage_Error-uint.frag.out
index 93070f2..c55a630 100644
--- a/Test/baseResults/spv.8bitstorage_Error-uint.frag.out
+++ b/Test/baseResults/spv.8bitstorage_Error-uint.frag.out
@@ -1,68 +1,68 @@
 spv.8bitstorage_Error-uint.frag
 ERROR: 0:54: 'structure: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:58: 'return: can't use with structs containing uint8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:61: 'uint8_t: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:74: '[: does not operate on types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:75: '.: can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:76: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:77: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:77: 'built-in function: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:78: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint8_t' (or there is no acceptable conversion)
 ERROR: 0:79: '-' :  wrong operand type no operation '-' exists that takes an operand of type layout( column_major std140 offset=0) uniform uint8_t (or there is no acceptable conversion)
 ERROR: 0:80: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type ' const int' (or there is no acceptable conversion)
 ERROR: 0:81: '.: can't swizzle types containing (u)int8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:82: '=: can't use with structs containing uint8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:83: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:84: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:85: 'qualifier: (u)int8 types can only be in uniform block or buffer storage' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:86: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'layout( column_major std140 offset=0) uniform uint8_t' and a right operand of type 'layout( column_major std140 offset=0) uniform uint8_t' (or there is no acceptable conversion)
 ERROR: 0:87: '=: can't use with arrays containing uint8' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:88: 'constructor: 8-bit vectors only take vector types' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:89: 'constructor: 8-bit arrays not supported' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:89: 'constructor: 8-bit vectors only take vector types' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:92: 'constructor: can't construct structure containing 8-bit type' : required extension not requested: Possible extensions include:
-GL_KHX_shader_explicit_arithmetic_types
-GL_KHX_shader_explicit_arithmetic_types_int8
+GL_EXT_shader_explicit_arithmetic_types
+GL_EXT_shader_explicit_arithmetic_types_int8
 ERROR: 0:93: 'func2' : no matching overloaded function found 
 ERROR: 0:99: '' :  syntax error, unexpected IDENTIFIER
 ERROR: 26 compilation errors.  No code generated.
diff --git a/Test/baseResults/spv.explicittypes.frag.out b/Test/baseResults/spv.explicittypes.frag.out
index 44f5ddd..1b5bcf0 100644
--- a/Test/baseResults/spv.explicittypes.frag.out
+++ b/Test/baseResults/spv.explicittypes.frag.out
@@ -19,14 +19,14 @@
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast8("
diff --git a/Test/baseResults/spv.float32.frag.out b/Test/baseResults/spv.float32.frag.out
index 1a325ea..3f07e4e 100644
--- a/Test/baseResults/spv.float32.frag.out
+++ b/Test/baseResults/spv.float32.frag.out
@@ -20,14 +20,14 @@
                               EntryPoint Fragment 4  "main" 471
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "operators("
diff --git a/Test/baseResults/spv.float64.frag.out b/Test/baseResults/spv.float64.frag.out
index 78dca75..6c0bfe7 100644
--- a/Test/baseResults/spv.float64.frag.out
+++ b/Test/baseResults/spv.float64.frag.out
@@ -20,14 +20,14 @@
                               EntryPoint Fragment 4  "main" 461
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "operators("
diff --git a/Test/baseResults/spv.int16.frag.out b/Test/baseResults/spv.int16.frag.out
index 3ba5c07..3cc5bf6 100644
--- a/Test/baseResults/spv.int16.frag.out
+++ b/Test/baseResults/spv.int16.frag.out
@@ -20,14 +20,14 @@
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast16("
diff --git a/Test/baseResults/spv.int32.frag.out b/Test/baseResults/spv.int32.frag.out
index 3b93428..8fd736e 100644
--- a/Test/baseResults/spv.int32.frag.out
+++ b/Test/baseResults/spv.int32.frag.out
@@ -18,14 +18,14 @@
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast32("
diff --git a/Test/baseResults/spv.int64.frag.out b/Test/baseResults/spv.int64.frag.out
index f2c54f1..013934c 100644
--- a/Test/baseResults/spv.int64.frag.out
+++ b/Test/baseResults/spv.int64.frag.out
@@ -16,7 +16,7 @@
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
                               SourceExtension  "GL_ARB_gpu_shader_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast("
diff --git a/Test/baseResults/spv.int8.frag.out b/Test/baseResults/spv.int8.frag.out
index 1c65384..b94bd48 100644
--- a/Test/baseResults/spv.int8.frag.out
+++ b/Test/baseResults/spv.int8.frag.out
@@ -20,14 +20,14 @@
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast8("
diff --git a/Test/baseResults/spv.vulkan110.int16.frag.out b/Test/baseResults/spv.vulkan110.int16.frag.out
index 9141e4e..1a51c26 100644
--- a/Test/baseResults/spv.vulkan110.int16.frag.out
+++ b/Test/baseResults/spv.vulkan110.int16.frag.out
@@ -19,14 +19,14 @@
                               EntryPoint Fragment 4  "main"
                               ExecutionMode 4 OriginUpperLeft
                               Source GLSL 450
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_float64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int16"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int32"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int64"
-                              SourceExtension  "GL_KHX_shader_explicit_arithmetic_types_int8"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_float64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int16"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int32"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int64"
+                              SourceExtension  "GL_EXT_shader_explicit_arithmetic_types_int8"
                               Name 4  "main"
                               Name 6  "literal("
                               Name 8  "typeCast16("
diff --git a/Test/baseResults/stringToDouble.vert.out b/Test/baseResults/stringToDouble.vert.out
index a799d0a..3829c70 100644
--- a/Test/baseResults/stringToDouble.vert.out
+++ b/Test/baseResults/stringToDouble.vert.out
@@ -1,6 +1,6 @@
 stringToDouble.vert
 Shader version: 460
-Requested GL_KHX_shader_explicit_arithmetic_types_float16
+Requested GL_EXT_shader_explicit_arithmetic_types_float16
 0:? Sequence
 0:3  Function Definition: main( ( global void)
 0:3    Function Parameters: 
@@ -524,7 +524,7 @@
 
 
 Shader version: 460
-Requested GL_KHX_shader_explicit_arithmetic_types_float16
+Requested GL_EXT_shader_explicit_arithmetic_types_float16
 0:? Sequence
 0:3  Function Definition: main( ( global void)
 0:3    Function Parameters: 
diff --git a/Test/constantUnaryConversion.comp b/Test/constantUnaryConversion.comp
index 467b6f6..3c479ae 100644
--- a/Test/constantUnaryConversion.comp
+++ b/Test/constantUnaryConversion.comp
@@ -1,6 +1,6 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types : require
+#extension GL_EXT_shader_explicit_arithmetic_types : require
 
 const bool bool_init = true;
 const int8_t int8_t_init = int8_t(-1);
diff --git a/Test/findFunction.frag b/Test/findFunction.frag
index 7e18065..41c0915 100644
--- a/Test/findFunction.frag
+++ b/Test/findFunction.frag
@@ -1,6 +1,6 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
 
 int64_t func(int8_t a, int16_t b, int16_t c)
 {
diff --git a/Test/spv.explicittypes.frag b/Test/spv.explicittypes.frag
index 18c070a..9941ea0 100644
--- a/Test/spv.explicittypes.frag
+++ b/Test/spv.explicittypes.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/spv.float32.frag b/Test/spv.float32.frag
index 471f6b3..f45dccd 100644
--- a/Test/spv.float32.frag
+++ b/Test/spv.float32.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 void main()
 {
diff --git a/Test/spv.float64.frag b/Test/spv.float64.frag
index efbec77..faaac23 100644
--- a/Test/spv.float64.frag
+++ b/Test/spv.float64.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 void main()
 {
diff --git a/Test/spv.int16.frag b/Test/spv.int16.frag
index d29894b..2feff4f 100644
--- a/Test/spv.int16.frag
+++ b/Test/spv.int16.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/spv.int32.frag b/Test/spv.int32.frag
index 3a33c67..0a39ecd 100644
--- a/Test/spv.int32.frag
+++ b/Test/spv.int32.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/spv.int64.frag b/Test/spv.int64.frag
index 4ec04cd..5390fb7 100644
--- a/Test/spv.int64.frag
+++ b/Test/spv.int64.frag
@@ -1,7 +1,7 @@
 #version 450
 
 #extension GL_ARB_gpu_shader_int64: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/spv.int8.frag b/Test/spv.int8.frag
index f41c62f..80702b7 100644
--- a/Test/spv.int8.frag
+++ b/Test/spv.int8.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/spv.vulkan110.int16.frag b/Test/spv.vulkan110.int16.frag
index d29894b..2feff4f 100644
--- a/Test/spv.vulkan110.int16.frag
+++ b/Test/spv.vulkan110.int16.frag
@@ -1,13 +1,13 @@
 #version 450
 
-#extension GL_KHX_shader_explicit_arithmetic_types: enable
-#extension GL_KHX_shader_explicit_arithmetic_types_int8: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_int64: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float16: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float32: require
-#extension GL_KHX_shader_explicit_arithmetic_types_float64: require
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32: require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64: require
 
 layout(binding = 0) uniform Uniforms
 {
diff --git a/Test/stringToDouble.vert b/Test/stringToDouble.vert
index 5a7024d..a8de3b4 100644
--- a/Test/stringToDouble.vert
+++ b/Test/stringToDouble.vert
@@ -1,5 +1,5 @@
 #version 460
-#extension GL_KHX_shader_explicit_arithmetic_types_float16 : enable
+#extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable
 void main()
 {
     float w1   = 00000.000;
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 46d4812..5ebb2e0 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -907,28 +907,28 @@
         break;
     case EOpConstructFloat16:
         promoteTo = EbtFloat16;
-        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float16);
+        canPromoteConstant = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_float16);
         break;
     case EOpConstructInt8:
         promoteTo = EbtInt8;
-        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int8);
+        canPromoteConstant = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int8);
         break;
     case EOpConstructUint8:
         promoteTo = EbtUint8;
-        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int8);
+        canPromoteConstant = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int8);
         break;
     case EOpConstructInt16:
         promoteTo = EbtInt16;
-        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int16);
+        canPromoteConstant = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int16);
         break;
     case EOpConstructUint16:
         promoteTo = EbtUint16;
-        canPromoteConstant = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                             extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int16);
+        canPromoteConstant = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                             extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int16);
         break;
     case EOpConstructInt:
         promoteTo = EbtInt;
@@ -1485,14 +1485,14 @@
         }
     }
 
-    bool explicitTypesEnabled = extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int8) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int16) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int32) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_int64) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float16) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float32) ||
-                                extensionRequested(E_GL_KHX_shader_explicit_arithmetic_types_float64);
+    bool explicitTypesEnabled = extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int8) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int16) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int32) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_int64) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_float16) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_float32) ||
+                                extensionRequested(E_GL_EXT_shader_explicit_arithmetic_types_float64);
 
     if (explicitTypesEnabled) {
         // integral promotions
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 67a861f..b32315b 100755
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -5750,14 +5750,14 @@
         return nullptr;
     }
 
-    bool explicitTypesEnabled = extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int8) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int16) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int32) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int64) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float16) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float32) ||
-                                extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float64);
+    bool explicitTypesEnabled = extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int8) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int16) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int32) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int64) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float16) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float32) ||
+                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float64);
 
     if (profile == EEsProfile || version < 120)
         function = findFunctionExact(loc, call, builtIn);
diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
index 4d2db38..2247250 100644
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -471,7 +471,7 @@
     (*KeywordMap)["u64vec3"] =                 U64VEC3;
     (*KeywordMap)["u64vec4"] =                 U64VEC4;
 
-    // GL_KHX_shader_explicit_arithmetic_types
+    // GL_EXT_shader_explicit_arithmetic_types
     (*KeywordMap)["int8_t"] =                  INT8_T;
     (*KeywordMap)["i8vec2"] =                  I8VEC2;
     (*KeywordMap)["i8vec3"] =                  I8VEC3;
@@ -1133,8 +1133,8 @@
         if (parseContext.symbolTable.atBuiltInLevel() ||
             (parseContext.profile != EEsProfile && parseContext.version >= 450 &&
              (parseContext.extensionTurnedOn(E_GL_ARB_gpu_shader_int64) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int64))))
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int64))))
             return keyword;
         return identifierOrType();
 
@@ -1148,9 +1148,9 @@
     case U8VEC4:
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
-            ((parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
+            ((parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
               parseContext.extensionTurnedOn(E_GL_EXT_shader_8bit_storage) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int8)) &&
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int8)) &&
               parseContext.profile != EEsProfile && parseContext.version >= 450))
             return keyword;
         return identifierOrType();
@@ -1171,8 +1171,8 @@
               parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_int16) ||
 #endif
               parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int16))))
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int16))))
             return keyword;
         return identifierOrType();
     case INT32_T:
@@ -1185,8 +1185,8 @@
     case U32VEC4:
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
-           ((parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-             parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_int32)) &&
+           ((parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+             parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_int32)) &&
              parseContext.profile != EEsProfile && parseContext.version >= 450))
             return keyword;
         return identifierOrType();
@@ -1208,8 +1208,8 @@
     case F32MAT4X4:
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
-            ((parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float32)) &&
+            ((parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float32)) &&
               parseContext.profile != EEsProfile && parseContext.version >= 450))
             return keyword;
         return identifierOrType();
@@ -1232,8 +1232,8 @@
     case F64MAT4X4:
         afterType = true;
         if (parseContext.symbolTable.atBuiltInLevel() ||
-            ((parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float64)) &&
+            ((parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float64)) &&
               parseContext.profile != EEsProfile && parseContext.version >= 450))
             return keyword;
         return identifierOrType();
@@ -1250,8 +1250,8 @@
               parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_half_float) ||
 #endif
               parseContext.extensionTurnedOn(E_GL_EXT_shader_16bit_storage) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float16))))
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float16))))
             return keyword;
 
         return identifierOrType();
@@ -1275,8 +1275,8 @@
 #ifdef AMD_EXTENSIONS
               parseContext.extensionTurnedOn(E_GL_AMD_gpu_shader_half_float) ||
 #endif
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types) ||
-              parseContext.extensionTurnedOn(E_GL_KHX_shader_explicit_arithmetic_types_float16))))
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types) ||
+              parseContext.extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float16))))
             return keyword;
 
         return identifierOrType();
diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 16265a3..f40b9f4 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -282,14 +282,14 @@
     extensionBehavior[E_GL_OVR_multiview2]               = EBhDisable;
 
     // explicit types
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types]         = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_int8]    = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_int16]   = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_int32]   = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_int64]   = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_float16] = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_float32] = EBhDisable;
-    extensionBehavior[E_GL_KHX_shader_explicit_arithmetic_types_float64] = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types]         = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_int8]    = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_int16]   = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_int32]   = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_int64]   = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_float16] = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_float32] = EBhDisable;
+    extensionBehavior[E_GL_EXT_shader_explicit_arithmetic_types_float64] = EBhDisable;
 }
 
 // Get code that is not part of a shared symbol table, is specific to this shader,
@@ -422,14 +422,14 @@
             "#define GL_NV_shader_texture_footprint 1\n"
             "#define GL_NV_mesh_shader 1\n"
 #endif
-            "#define GL_KHX_shader_explicit_arithmetic_types 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_int8 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_int16 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_int32 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_int64 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_float16 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_float32 1\n"
-            "#define GL_KHX_shader_explicit_arithmetic_types_float64 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_int8 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_int16 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_int32 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_int64 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_float16 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_float32 1\n"
+            "#define GL_EXT_shader_explicit_arithmetic_types_float64 1\n"
             ;
 
         if (version >= 150) {
@@ -877,8 +877,8 @@
 #if AMD_EXTENSIONS
                                            E_GL_AMD_gpu_shader_half_float,
 #endif
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_float16};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_float16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
@@ -889,8 +889,8 @@
 #if AMD_EXTENSIONS
                                        E_GL_AMD_gpu_shader_half_float,
 #endif
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_float16};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_float16};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
 
@@ -900,16 +900,16 @@
 #if AMD_EXTENSIONS
                                        E_GL_AMD_gpu_shader_int16,
 #endif
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_int16};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_int16};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
 
 bool TParseVersions::int8Arithmetic()
 {
     const char* const extensions[] = {
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_int8};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_int8};
     return extensionsTurnedOn(sizeof(extensions)/sizeof(extensions[0]), extensions);
 }
 
@@ -924,8 +924,8 @@
 #if AMD_EXTENSIONS
                                        E_GL_AMD_gpu_shader_half_float,
 #endif
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_float16};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_float16};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
 
@@ -940,8 +940,8 @@
 #if AMD_EXTENSIONS
                                        E_GL_AMD_gpu_shader_int16,
 #endif
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_int16};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_int16};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
 
@@ -953,8 +953,8 @@
     combined += featureDesc;
 
     const char* const extensions[] = {
-                                       E_GL_KHX_shader_explicit_arithmetic_types,
-                                       E_GL_KHX_shader_explicit_arithmetic_types_int8};
+                                       E_GL_EXT_shader_explicit_arithmetic_types,
+                                       E_GL_EXT_shader_explicit_arithmetic_types_int8};
     requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, combined.c_str());
 }
 
@@ -966,8 +966,8 @@
                                            E_GL_AMD_gpu_shader_half_float,
 #endif
                                            E_GL_EXT_shader_16bit_storage,
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_float16};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_float16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
@@ -976,8 +976,8 @@
 void TParseVersions::explicitFloat32Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (!builtIn) {
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_float32};
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_float32};
         requireExtensions(loc, 2, extensions, op);
     }
 }
@@ -986,8 +986,8 @@
 void TParseVersions::explicitFloat64Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (!builtIn) {
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_float64};
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_float64};
         requireExtensions(loc, 2, extensions, op);
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
         profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
@@ -998,8 +998,8 @@
 void TParseVersions::explicitInt8Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (! builtIn) {
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int8};
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int8};
         requireExtensions(loc, 2, extensions, op);
     }
 }
@@ -1024,8 +1024,8 @@
 #if AMD_EXTENSIONS
                                            E_GL_AMD_gpu_shader_int16,
 #endif
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int16};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
@@ -1038,8 +1038,8 @@
                                            E_GL_AMD_gpu_shader_int16,
 #endif
                                            E_GL_EXT_shader_16bit_storage,
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int16};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int16};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
@@ -1049,8 +1049,8 @@
     if (! builtIn) {
     	const char* const extensions[] = {
                                            E_GL_EXT_shader_8bit_storage,
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int8};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int8};
         requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, op);
     }
 }
@@ -1059,8 +1059,8 @@
 void TParseVersions::explicitInt32Check(const TSourceLoc& loc, const char* op, bool builtIn)
 {
     if (! builtIn) {
-        const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int32};
+        const char* const extensions[2] = {E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int32};
         requireExtensions(loc, 2, extensions, op);
     }
 }
@@ -1070,8 +1070,8 @@
 {
     if (! builtIn) {
         const char* const extensions[3] = {E_GL_ARB_gpu_shader_int64,
-                                           E_GL_KHX_shader_explicit_arithmetic_types,
-                                           E_GL_KHX_shader_explicit_arithmetic_types_int64};
+                                           E_GL_EXT_shader_explicit_arithmetic_types,
+                                           E_GL_EXT_shader_explicit_arithmetic_types_int64};
         requireExtensions(loc, 3, extensions, op);
         requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);
         profileRequires(loc, ECoreProfile | ECompatibilityProfile, 400, nullptr, op);
diff --git a/glslang/MachineIndependent/Versions.h b/glslang/MachineIndependent/Versions.h
index 6b513b4..3f704f3 100644
--- a/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@ -251,14 +251,14 @@
 const char* const E_GL_OES_texture_cube_map_array               = "GL_OES_texture_cube_map_array";
 
 // KHX
-const char* const E_GL_KHX_shader_explicit_arithmetic_types          = "GL_KHX_shader_explicit_arithmetic_types";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_int8     = "GL_KHX_shader_explicit_arithmetic_types_int8";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_int16    = "GL_KHX_shader_explicit_arithmetic_types_int16";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_int32    = "GL_KHX_shader_explicit_arithmetic_types_int32";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_int64    = "GL_KHX_shader_explicit_arithmetic_types_int64";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_float16  = "GL_KHX_shader_explicit_arithmetic_types_float16";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_float32  = "GL_KHX_shader_explicit_arithmetic_types_float32";
-const char* const E_GL_KHX_shader_explicit_arithmetic_types_float64  = "GL_KHX_shader_explicit_arithmetic_types_float64";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types          = "GL_EXT_shader_explicit_arithmetic_types";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_int8     = "GL_EXT_shader_explicit_arithmetic_types_int8";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_int16    = "GL_EXT_shader_explicit_arithmetic_types_int16";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_int32    = "GL_EXT_shader_explicit_arithmetic_types_int32";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_int64    = "GL_EXT_shader_explicit_arithmetic_types_int64";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_float16  = "GL_EXT_shader_explicit_arithmetic_types_float16";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_float32  = "GL_EXT_shader_explicit_arithmetic_types_float32";
+const char* const E_GL_EXT_shader_explicit_arithmetic_types_float64  = "GL_EXT_shader_explicit_arithmetic_types_float64";
 
 // Arrays of extensions for the above AEP duplications
 
diff --git a/glslang/MachineIndependent/preprocessor/PpScanner.cpp b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
index 1faa018..b1d937c 100644
--- a/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+++ b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
@@ -446,16 +446,16 @@
 
     static const char* const Int64_Extensions[] = {
         E_GL_ARB_gpu_shader_int64,
-        E_GL_KHX_shader_explicit_arithmetic_types,
-        E_GL_KHX_shader_explicit_arithmetic_types_int64 };
+        E_GL_EXT_shader_explicit_arithmetic_types,
+        E_GL_EXT_shader_explicit_arithmetic_types_int64 };
     static const int Num_Int64_Extensions = sizeof(Int64_Extensions) / sizeof(Int64_Extensions[0]);
 
     static const char* const Int16_Extensions[] = {
 #ifdef AMD_EXTENSIONS
         E_GL_AMD_gpu_shader_int16,
 #endif
-        E_GL_KHX_shader_explicit_arithmetic_types,
-        E_GL_KHX_shader_explicit_arithmetic_types_int16 };
+        E_GL_EXT_shader_explicit_arithmetic_types,
+        E_GL_EXT_shader_explicit_arithmetic_types_int16 };
     static const int Num_Int16_Extensions = sizeof(Int16_Extensions) / sizeof(Int16_Extensions[0]);
 
     ppToken->ival = 0;