diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json
index e7383309..f0eb0802 100644
--- a/eval-win10x64-enterprise-cygwin.json
+++ b/eval-win10x64-enterprise-cygwin.json
@@ -82,7 +82,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json
index 6fa9975c..0845d232 100644
--- a/eval-win10x64-enterprise-ssh.json
+++ b/eval-win10x64-enterprise-ssh.json
@@ -80,7 +80,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json
index 4b563843..cba25c12 100644
--- a/eval-win10x64-enterprise.json
+++ b/eval-win10x64-enterprise.json
@@ -77,7 +77,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json
index beff8b50..28d9814e 100644
--- a/eval-win10x86-enterprise-cygwin.json
+++ b/eval-win10x86-enterprise-cygwin.json
@@ -82,7 +82,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json
index 475f75bb..b20e2911 100644
--- a/eval-win10x86-enterprise-ssh.json
+++ b/eval-win10x86-enterprise-ssh.json
@@ -80,7 +80,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json
index 07086afd..89f98b1b 100644
--- a/eval-win10x86-enterprise.json
+++ b/eval-win10x86-enterprise.json
@@ -77,7 +77,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json
index 484543d3..ffbfea29 100644
--- a/eval-win2012r2-datacenter-cygwin.json
+++ b/eval-win2012r2-datacenter-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json
index c3403a97..e56c29a8 100644
--- a/eval-win2012r2-datacenter-ssh.json
+++ b/eval-win2012r2-datacenter-ssh.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json
index 270bee26..d1c2cf46 100644
--- a/eval-win2012r2-datacenter.json
+++ b/eval-win2012r2-datacenter.json
@@ -69,7 +69,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json
index de19a022..ff9e8abe 100644
--- a/eval-win2012r2-standard-cygwin.json
+++ b/eval-win2012r2-standard-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json
index 362a5262..d4d62098 100644
--- a/eval-win2012r2-standard-ssh.json
+++ b/eval-win2012r2-standard-ssh.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json
index 89bf9566..15348253 100644
--- a/eval-win2012r2-standard.json
+++ b/eval-win2012r2-standard.json
@@ -69,7 +69,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json
index 35dbe5d2..a1a1e718 100644
--- a/eval-win2016-standard-cygwin.json
+++ b/eval-win2016-standard-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json
index c7b68cee..073f2a71 100644
--- a/eval-win2016-standard-ssh.json
+++ b/eval-win2016-standard-ssh.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json
index d9dddcb5..50ef8240 100644
--- a/eval-win2016-standard.json
+++ b/eval-win2016-standard.json
@@ -69,7 +69,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json
index 3caaec26..d35dca7d 100644
--- a/eval-win81x64-enterprise-cygwin.json
+++ b/eval-win81x64-enterprise-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json
index 0df0912a..5b8646b3 100644
--- a/eval-win81x64-enterprise-ssh.json
+++ b/eval-win81x64-enterprise-ssh.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json
index c17a2bea..8b3d0f40 100644
--- a/eval-win81x64-enterprise.json
+++ b/eval-win81x64-enterprise.json
@@ -71,7 +71,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json
index 6b7df223..2a829b02 100644
--- a/eval-win81x86-enterprise-cygwin.json
+++ b/eval-win81x86-enterprise-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json
index 6f04ce41..41184d74 100644
--- a/eval-win81x86-enterprise-ssh.json
+++ b/eval-win81x86-enterprise-ssh.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json
index af43f64b..531cadc7 100644
--- a/eval-win81x86-enterprise.json
+++ b/eval-win81x86-enterprise.json
@@ -69,7 +69,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json
index 506b13a6..49c06450 100644
--- a/win2012r2-datacenter-cygwin.json
+++ b/win2012r2-datacenter-cygwin.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json
index 3ae8ec4a..6ac4da5f 100644
--- a/win2012r2-datacenter-ssh.json
+++ b/win2012r2-datacenter-ssh.json
@@ -68,7 +68,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json
index 074e7957..1caf372a 100644
--- a/win2012r2-datacenter.json
+++ b/win2012r2-datacenter.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json
index 8aeb7fda..d77dac72 100644
--- a/win2012r2-standard-cygwin.json
+++ b/win2012r2-standard-cygwin.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json
index a980b4e8..5f9aaaba 100644
--- a/win2012r2-standard-ssh.json
+++ b/win2012r2-standard-ssh.json
@@ -68,7 +68,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standard.json b/win2012r2-standard.json
index c18197c7..1555f95b 100644
--- a/win2012r2-standard.json
+++ b/win2012r2-standard.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json
index 456a8e3c..4eee4466 100644
--- a/win2012r2-standardcore-cygwin.json
+++ b/win2012r2-standardcore-cygwin.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json
index 3d94a9f1..3ef35d43 100644
--- a/win2012r2-standardcore-ssh.json
+++ b/win2012r2-standardcore-ssh.json
@@ -68,7 +68,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json
index b3c1dd0a..489aeb2c 100644
--- a/win2012r2-standardcore.json
+++ b/win2012r2-standardcore.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json
index e8aaa8d0..49e6fb13 100644
--- a/win2016-standard-cygwin.json
+++ b/win2016-standard-cygwin.json
@@ -72,7 +72,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json
index f13b5fa5..6110a7c5 100644
--- a/win2016-standard-ssh.json
+++ b/win2016-standard-ssh.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win2016-standard.json b/win2016-standard.json
index 19274fb7..204b7042 100644
--- a/win2016-standard.json
+++ b/win2016-standard.json
@@ -69,7 +69,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json
index a16c2d86..a45d5196 100644
--- a/win81x64-enterprise-cygwin.json
+++ b/win81x64-enterprise-cygwin.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json
index 6e8ebca4..28ea1cd0 100644
--- a/win81x64-enterprise-ssh.json
+++ b/win81x64-enterprise-ssh.json
@@ -68,7 +68,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json
index c1456e32..96597cc9 100644
--- a/win81x64-enterprise.json
+++ b/win81x64-enterprise.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json
index 33672451..878d28db 100644
--- a/win81x64-pro-cygwin.json
+++ b/win81x64-pro-cygwin.json
@@ -70,7 +70,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json
index df759d04..683ba548 100644
--- a/win81x64-pro-ssh.json
+++ b/win81x64-pro-ssh.json
@@ -68,7 +68,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],
diff --git a/win81x64-pro.json b/win81x64-pro.json
index 56f6ed78..e5e16b76 100644
--- a/win81x64-pro.json
+++ b/win81x64-pro.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],