diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
index 434bcd9fe..a4ce964c6 100644
--- a/include/spirv/unified1/spirv.bf
+++ b/include/spirv/unified1/spirv.bf
@@ -603,9 +603,6 @@ namespace Spv
             SingleElementVectorINTEL = 6085,
             VectorComputeCallableFunctionINTEL = 6087,
             MediaBlockIOINTEL = 6140,
-            InitModeINTEL = 6147,
-            ImplementInRegisterMapINTEL = 6148,
-            HostAccessINTEL = 6168,
             FPMaxErrorDecorationINTEL = 6170,
             LatencyControlLabelINTEL = 6172,
             LatencyControlConstraintINTEL = 6173,
@@ -618,6 +615,9 @@ namespace Spv
             MMHostInterfaceMaxBurstINTEL = 6181,
             MMHostInterfaceWaitRequestINTEL = 6182,
             StableKernelArgumentINTEL = 6183,
+            HostAccessINTEL = 6188,
+            InitModeINTEL = 6190,
+            ImplementInRegisterMapINTEL = 6191,
             CacheControlLoadINTEL = 6442,
             CacheControlStoreINTEL = 6443,
         }
@@ -1203,12 +1203,12 @@ namespace Spv
             DebugInfoModuleINTEL = 6114,
             BFloat16ConversionINTEL = 6115,
             SplitBarrierINTEL = 6141,
-            GlobalVariableFPGADecorationsINTEL = 6146,
             FPGAKernelAttributesv2INTEL = 6161,
-            GlobalVariableHostAccessINTEL = 6167,
             FPMaxErrorINTEL = 6169,
             FPGALatencyControlINTEL = 6171,
             FPGAArgumentInterfacesINTEL = 6174,
+            GlobalVariableHostAccessINTEL = 6187,
+            GlobalVariableFPGADecorationsINTEL = 6189,
             GroupUniformArithmeticKHR = 6400,
             CacheControlsINTEL = 6441,
         }
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index 8b828719a..7e43ed42f 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -13567,34 +13567,6 @@
           "capabilities" : [ "VectorComputeINTEL" ],
           "version" : "None"
         },
-        {
-          "enumerant" : "InitModeINTEL",
-          "value" : 6147,
-          "parameters": [
-            { "kind" : "InitializationModeQualifier", "name" : "'Trigger'" }
-          ],
-          "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "ImplementInRegisterMapINTEL",
-          "value" : 6148,
-          "parameters": [
-            { "kind" : "LiteralInteger", "name" : "Value" }
-          ],
-          "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "HostAccessINTEL",
-          "value" : 6168,
-          "parameters": [
-            { "kind" : "HostAccessQualifier", "name" : "'Access'" },
-            { "kind" : "LiteralString", "name" : "'Name'" }
-          ],
-          "capabilities" : [ "GlobalVariableHostAccessINTEL" ],
-          "version" : "None"
-        },
         {
           "enumerant" : "FPMaxErrorDecorationINTEL",
           "value" : 6170,
@@ -13696,6 +13668,34 @@
           "capabilities" : [ "FPGAArgumentInterfacesINTEL" ],
           "version" : "None"
         },
+        {
+          "enumerant" : "HostAccessINTEL",
+          "value" : 6188,
+          "parameters": [
+            { "kind" : "HostAccessQualifier", "name" : "'Access'" },
+            { "kind" : "LiteralString", "name" : "'Name'" }
+          ],
+          "capabilities" : [ "GlobalVariableHostAccessINTEL" ],
+          "version" : "None"
+        },
+        {
+          "enumerant" : "InitModeINTEL",
+          "value" : 6190,
+          "parameters": [
+            { "kind" : "InitializationModeQualifier", "name" : "'Trigger'" }
+          ],
+          "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ],
+          "version" : "None"
+        },
+        {
+          "enumerant" : "ImplementInRegisterMapINTEL",
+          "value" : 6191,
+          "parameters": [
+            { "kind" : "LiteralInteger", "name" : "Value" }
+          ],
+          "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ],
+          "version" : "None"
+        },
         {
           "enumerant" : "CacheControlLoadINTEL",
           "value" : 6442,
@@ -16259,12 +16259,6 @@
           "extensions" : [ "SPV_INTEL_split_barrier" ],
           "version" : "None"
         },
-        {
-          "enumerant" : "GlobalVariableFPGADecorationsINTEL",
-          "value" : 6146,
-          "extensions": [ "SPV_INTEL_global_variable_fpga_decorations" ],
-          "version" : "None"
-        },
         {
           "enumerant" : "FPGAKernelAttributesv2INTEL",
           "value" : 6161,
@@ -16272,12 +16266,6 @@
           "extensions" : [ "SPV_INTEL_kernel_attributes" ],
           "version" : "None"
         },
-        {
-          "enumerant" : "GlobalVariableHostAccessINTEL",
-          "value" : 6167,
-          "extensions": [ "SPV_INTEL_global_variable_host_access" ],
-          "version" : "None"
-        },
         {
           "enumerant" : "FPMaxErrorINTEL",
           "value" : 6169,
@@ -16296,6 +16284,18 @@
           "extensions" : [ "SPV_INTEL_fpga_argument_interfaces" ],
           "version" : "None"
         },
+        {
+          "enumerant" : "GlobalVariableHostAccessINTEL",
+          "value" : 6187,
+          "extensions": [ "SPV_INTEL_global_variable_host_access" ],
+          "version" : "None"
+        },
+        {
+          "enumerant" : "GlobalVariableFPGADecorationsINTEL",
+          "value" : 6189,
+          "extensions": [ "SPV_INTEL_global_variable_fpga_decorations" ],
+          "version" : "None"
+        },
         {
           "enumerant" : "GroupUniformArithmeticKHR",
           "value" : 6400,
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index cec6da77c..446562826 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -602,9 +602,6 @@ public enum Decoration
             SingleElementVectorINTEL = 6085,
             VectorComputeCallableFunctionINTEL = 6087,
             MediaBlockIOINTEL = 6140,
-            InitModeINTEL = 6147,
-            ImplementInRegisterMapINTEL = 6148,
-            HostAccessINTEL = 6168,
             FPMaxErrorDecorationINTEL = 6170,
             LatencyControlLabelINTEL = 6172,
             LatencyControlConstraintINTEL = 6173,
@@ -617,6 +614,9 @@ public enum Decoration
             MMHostInterfaceMaxBurstINTEL = 6181,
             MMHostInterfaceWaitRequestINTEL = 6182,
             StableKernelArgumentINTEL = 6183,
+            HostAccessINTEL = 6188,
+            InitModeINTEL = 6190,
+            ImplementInRegisterMapINTEL = 6191,
             CacheControlLoadINTEL = 6442,
             CacheControlStoreINTEL = 6443,
         }
@@ -1202,12 +1202,12 @@ public enum Capability
             DebugInfoModuleINTEL = 6114,
             BFloat16ConversionINTEL = 6115,
             SplitBarrierINTEL = 6141,
-            GlobalVariableFPGADecorationsINTEL = 6146,
             FPGAKernelAttributesv2INTEL = 6161,
-            GlobalVariableHostAccessINTEL = 6167,
             FPMaxErrorINTEL = 6169,
             FPGALatencyControlINTEL = 6171,
             FPGAArgumentInterfacesINTEL = 6174,
+            GlobalVariableHostAccessINTEL = 6187,
+            GlobalVariableFPGADecorationsINTEL = 6189,
             GroupUniformArithmeticKHR = 6400,
             CacheControlsINTEL = 6441,
         }
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 5becba25d..a1718715d 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -608,9 +608,6 @@ typedef enum SpvDecoration_ {
     SpvDecorationSingleElementVectorINTEL = 6085,
     SpvDecorationVectorComputeCallableFunctionINTEL = 6087,
     SpvDecorationMediaBlockIOINTEL = 6140,
-    SpvDecorationInitModeINTEL = 6147,
-    SpvDecorationImplementInRegisterMapINTEL = 6148,
-    SpvDecorationHostAccessINTEL = 6168,
     SpvDecorationFPMaxErrorDecorationINTEL = 6170,
     SpvDecorationLatencyControlLabelINTEL = 6172,
     SpvDecorationLatencyControlConstraintINTEL = 6173,
@@ -623,6 +620,9 @@ typedef enum SpvDecoration_ {
     SpvDecorationMMHostInterfaceMaxBurstINTEL = 6181,
     SpvDecorationMMHostInterfaceWaitRequestINTEL = 6182,
     SpvDecorationStableKernelArgumentINTEL = 6183,
+    SpvDecorationHostAccessINTEL = 6188,
+    SpvDecorationInitModeINTEL = 6190,
+    SpvDecorationImplementInRegisterMapINTEL = 6191,
     SpvDecorationCacheControlLoadINTEL = 6442,
     SpvDecorationCacheControlStoreINTEL = 6443,
     SpvDecorationMax = 0x7fffffff,
@@ -1202,12 +1202,12 @@ typedef enum SpvCapability_ {
     SpvCapabilityDebugInfoModuleINTEL = 6114,
     SpvCapabilityBFloat16ConversionINTEL = 6115,
     SpvCapabilitySplitBarrierINTEL = 6141,
-    SpvCapabilityGlobalVariableFPGADecorationsINTEL = 6146,
     SpvCapabilityFPGAKernelAttributesv2INTEL = 6161,
-    SpvCapabilityGlobalVariableHostAccessINTEL = 6167,
     SpvCapabilityFPMaxErrorINTEL = 6169,
     SpvCapabilityFPGALatencyControlINTEL = 6171,
     SpvCapabilityFPGAArgumentInterfacesINTEL = 6174,
+    SpvCapabilityGlobalVariableHostAccessINTEL = 6187,
+    SpvCapabilityGlobalVariableFPGADecorationsINTEL = 6189,
     SpvCapabilityGroupUniformArithmeticKHR = 6400,
     SpvCapabilityCacheControlsINTEL = 6441,
     SpvCapabilityMax = 0x7fffffff,
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 6e0457ed3..5507f47b8 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -604,9 +604,6 @@ enum Decoration {
     DecorationSingleElementVectorINTEL = 6085,
     DecorationVectorComputeCallableFunctionINTEL = 6087,
     DecorationMediaBlockIOINTEL = 6140,
-    DecorationInitModeINTEL = 6147,
-    DecorationImplementInRegisterMapINTEL = 6148,
-    DecorationHostAccessINTEL = 6168,
     DecorationFPMaxErrorDecorationINTEL = 6170,
     DecorationLatencyControlLabelINTEL = 6172,
     DecorationLatencyControlConstraintINTEL = 6173,
@@ -619,6 +616,9 @@ enum Decoration {
     DecorationMMHostInterfaceMaxBurstINTEL = 6181,
     DecorationMMHostInterfaceWaitRequestINTEL = 6182,
     DecorationStableKernelArgumentINTEL = 6183,
+    DecorationHostAccessINTEL = 6188,
+    DecorationInitModeINTEL = 6190,
+    DecorationImplementInRegisterMapINTEL = 6191,
     DecorationCacheControlLoadINTEL = 6442,
     DecorationCacheControlStoreINTEL = 6443,
     DecorationMax = 0x7fffffff,
@@ -1198,12 +1198,12 @@ enum Capability {
     CapabilityDebugInfoModuleINTEL = 6114,
     CapabilityBFloat16ConversionINTEL = 6115,
     CapabilitySplitBarrierINTEL = 6141,
-    CapabilityGlobalVariableFPGADecorationsINTEL = 6146,
     CapabilityFPGAKernelAttributesv2INTEL = 6161,
-    CapabilityGlobalVariableHostAccessINTEL = 6167,
     CapabilityFPMaxErrorINTEL = 6169,
     CapabilityFPGALatencyControlINTEL = 6171,
     CapabilityFPGAArgumentInterfacesINTEL = 6174,
+    CapabilityGlobalVariableHostAccessINTEL = 6187,
+    CapabilityGlobalVariableFPGADecorationsINTEL = 6189,
     CapabilityGroupUniformArithmeticKHR = 6400,
     CapabilityCacheControlsINTEL = 6441,
     CapabilityMax = 0x7fffffff,
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index f10a13507..e49e491e3 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -604,9 +604,6 @@ enum class Decoration : unsigned {
     SingleElementVectorINTEL = 6085,
     VectorComputeCallableFunctionINTEL = 6087,
     MediaBlockIOINTEL = 6140,
-    InitModeINTEL = 6147,
-    ImplementInRegisterMapINTEL = 6148,
-    HostAccessINTEL = 6168,
     FPMaxErrorDecorationINTEL = 6170,
     LatencyControlLabelINTEL = 6172,
     LatencyControlConstraintINTEL = 6173,
@@ -619,6 +616,9 @@ enum class Decoration : unsigned {
     MMHostInterfaceMaxBurstINTEL = 6181,
     MMHostInterfaceWaitRequestINTEL = 6182,
     StableKernelArgumentINTEL = 6183,
+    HostAccessINTEL = 6188,
+    InitModeINTEL = 6190,
+    ImplementInRegisterMapINTEL = 6191,
     CacheControlLoadINTEL = 6442,
     CacheControlStoreINTEL = 6443,
     Max = 0x7fffffff,
@@ -1198,12 +1198,12 @@ enum class Capability : unsigned {
     DebugInfoModuleINTEL = 6114,
     BFloat16ConversionINTEL = 6115,
     SplitBarrierINTEL = 6141,
-    GlobalVariableFPGADecorationsINTEL = 6146,
     FPGAKernelAttributesv2INTEL = 6161,
-    GlobalVariableHostAccessINTEL = 6167,
     FPMaxErrorINTEL = 6169,
     FPGALatencyControlINTEL = 6171,
     FPGAArgumentInterfacesINTEL = 6174,
+    GlobalVariableHostAccessINTEL = 6187,
+    GlobalVariableFPGADecorationsINTEL = 6189,
     GroupUniformArithmeticKHR = 6400,
     CacheControlsINTEL = 6441,
     Max = 0x7fffffff,
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 44a30fa18..f1ad055aa 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -630,9 +630,6 @@
                     "SingleElementVectorINTEL": 6085,
                     "VectorComputeCallableFunctionINTEL": 6087,
                     "MediaBlockIOINTEL": 6140,
-                    "InitModeINTEL": 6147,
-                    "ImplementInRegisterMapINTEL": 6148,
-                    "HostAccessINTEL": 6168,
                     "FPMaxErrorDecorationINTEL": 6170,
                     "LatencyControlLabelINTEL": 6172,
                     "LatencyControlConstraintINTEL": 6173,
@@ -645,6 +642,9 @@
                     "MMHostInterfaceMaxBurstINTEL": 6181,
                     "MMHostInterfaceWaitRequestINTEL": 6182,
                     "StableKernelArgumentINTEL": 6183,
+                    "HostAccessINTEL": 6188,
+                    "InitModeINTEL": 6190,
+                    "ImplementInRegisterMapINTEL": 6191,
                     "CacheControlLoadINTEL": 6442,
                     "CacheControlStoreINTEL": 6443
                 }
@@ -1178,12 +1178,12 @@
                     "DebugInfoModuleINTEL": 6114,
                     "BFloat16ConversionINTEL": 6115,
                     "SplitBarrierINTEL": 6141,
-                    "GlobalVariableFPGADecorationsINTEL": 6146,
                     "FPGAKernelAttributesv2INTEL": 6161,
-                    "GlobalVariableHostAccessINTEL": 6167,
                     "FPMaxErrorINTEL": 6169,
                     "FPGALatencyControlINTEL": 6171,
                     "FPGAArgumentInterfacesINTEL": 6174,
+                    "GlobalVariableHostAccessINTEL": 6187,
+                    "GlobalVariableFPGADecorationsINTEL": 6189,
                     "GroupUniformArithmeticKHR": 6400,
                     "CacheControlsINTEL": 6441
                 }
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index d2d2829cc..d4ca2fa98 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -577,9 +577,6 @@ spv = {
         SingleElementVectorINTEL = 6085,
         VectorComputeCallableFunctionINTEL = 6087,
         MediaBlockIOINTEL = 6140,
-        InitModeINTEL = 6147,
-        ImplementInRegisterMapINTEL = 6148,
-        HostAccessINTEL = 6168,
         FPMaxErrorDecorationINTEL = 6170,
         LatencyControlLabelINTEL = 6172,
         LatencyControlConstraintINTEL = 6173,
@@ -592,6 +589,9 @@ spv = {
         MMHostInterfaceMaxBurstINTEL = 6181,
         MMHostInterfaceWaitRequestINTEL = 6182,
         StableKernelArgumentINTEL = 6183,
+        HostAccessINTEL = 6188,
+        InitModeINTEL = 6190,
+        ImplementInRegisterMapINTEL = 6191,
         CacheControlLoadINTEL = 6442,
         CacheControlStoreINTEL = 6443,
     },
@@ -1160,12 +1160,12 @@ spv = {
         DebugInfoModuleINTEL = 6114,
         BFloat16ConversionINTEL = 6115,
         SplitBarrierINTEL = 6141,
-        GlobalVariableFPGADecorationsINTEL = 6146,
         FPGAKernelAttributesv2INTEL = 6161,
-        GlobalVariableHostAccessINTEL = 6167,
         FPMaxErrorINTEL = 6169,
         FPGALatencyControlINTEL = 6171,
         FPGAArgumentInterfacesINTEL = 6174,
+        GlobalVariableHostAccessINTEL = 6187,
+        GlobalVariableFPGADecorationsINTEL = 6189,
         GroupUniformArithmeticKHR = 6400,
         CacheControlsINTEL = 6441,
     },
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 637448418..c842bbfd1 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -577,9 +577,6 @@
         'SingleElementVectorINTEL' : 6085,
         'VectorComputeCallableFunctionINTEL' : 6087,
         'MediaBlockIOINTEL' : 6140,
-        'InitModeINTEL' : 6147,
-        'ImplementInRegisterMapINTEL' : 6148,
-        'HostAccessINTEL' : 6168,
         'FPMaxErrorDecorationINTEL' : 6170,
         'LatencyControlLabelINTEL' : 6172,
         'LatencyControlConstraintINTEL' : 6173,
@@ -592,6 +589,9 @@
         'MMHostInterfaceMaxBurstINTEL' : 6181,
         'MMHostInterfaceWaitRequestINTEL' : 6182,
         'StableKernelArgumentINTEL' : 6183,
+        'HostAccessINTEL' : 6188,
+        'InitModeINTEL' : 6190,
+        'ImplementInRegisterMapINTEL' : 6191,
         'CacheControlLoadINTEL' : 6442,
         'CacheControlStoreINTEL' : 6443,
     },
@@ -1160,12 +1160,12 @@
         'DebugInfoModuleINTEL' : 6114,
         'BFloat16ConversionINTEL' : 6115,
         'SplitBarrierINTEL' : 6141,
-        'GlobalVariableFPGADecorationsINTEL' : 6146,
         'FPGAKernelAttributesv2INTEL' : 6161,
-        'GlobalVariableHostAccessINTEL' : 6167,
         'FPMaxErrorINTEL' : 6169,
         'FPGALatencyControlINTEL' : 6171,
         'FPGAArgumentInterfacesINTEL' : 6174,
+        'GlobalVariableHostAccessINTEL' : 6187,
+        'GlobalVariableFPGADecorationsINTEL' : 6189,
         'GroupUniformArithmeticKHR' : 6400,
         'CacheControlsINTEL' : 6441,
     },
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 4335f3b5d..238caacbd 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -605,9 +605,6 @@ enum Decoration : uint
     SingleElementVectorINTEL = 6085,
     VectorComputeCallableFunctionINTEL = 6087,
     MediaBlockIOINTEL = 6140,
-    InitModeINTEL = 6147,
-    ImplementInRegisterMapINTEL = 6148,
-    HostAccessINTEL = 6168,
     FPMaxErrorDecorationINTEL = 6170,
     LatencyControlLabelINTEL = 6172,
     LatencyControlConstraintINTEL = 6173,
@@ -620,6 +617,9 @@ enum Decoration : uint
     MMHostInterfaceMaxBurstINTEL = 6181,
     MMHostInterfaceWaitRequestINTEL = 6182,
     StableKernelArgumentINTEL = 6183,
+    HostAccessINTEL = 6188,
+    InitModeINTEL = 6190,
+    ImplementInRegisterMapINTEL = 6191,
     CacheControlLoadINTEL = 6442,
     CacheControlStoreINTEL = 6443,
 }
@@ -1205,12 +1205,12 @@ enum Capability : uint
     DebugInfoModuleINTEL = 6114,
     BFloat16ConversionINTEL = 6115,
     SplitBarrierINTEL = 6141,
-    GlobalVariableFPGADecorationsINTEL = 6146,
     FPGAKernelAttributesv2INTEL = 6161,
-    GlobalVariableHostAccessINTEL = 6167,
     FPMaxErrorINTEL = 6169,
     FPGALatencyControlINTEL = 6171,
     FPGAArgumentInterfacesINTEL = 6174,
+    GlobalVariableHostAccessINTEL = 6187,
+    GlobalVariableFPGADecorationsINTEL = 6189,
     GroupUniformArithmeticKHR = 6400,
     CacheControlsINTEL = 6441,
 }