diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json
index 26af24d3..e135d000 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 e69adda8..317b7299 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 3a20d41f..3d4e3619 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 7ae87429..e2d16235 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 f8cf4d81..ba81d044 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 757e7be3..5aeba353 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 92867bbc..3f84070b 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 9033177f..3d882966 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 ba79bc36..883c5407 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 72b10970..663d1691 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 b40a2617..d4385631 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 409fd607..0c63aadc 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 9a34abf6..6e5b860b 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 5477c93e..eff8e31f 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 0be63bd9..88c13bdd 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 d9758822..067c33bd 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 268eb45b..7e8aa75d 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 c671d911..4a3ef850 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 90612ced..08e3694c 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 29ac90f9..7aa32f0b 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 eb8b2188..c776a726 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 632aa127..baed34f4 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 2fef4c03..9921606e 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 d6368e3f..c2de0faa 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 6289b0ba..52a24db1 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 f08568b5..f20708b3 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 0da22a6a..d684fb51 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 06f2dba5..ed8c44f3 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 250719a3..5b910066 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 697ffe49..bbaaefd3 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 23d1559d..c03df076 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 bea2195a..18cfef8f 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 05455b66..fb629908 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 eb084778..3e80fd31 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 1bbad347..10e2a609 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 9d6bbfb5..740029ba 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 6f4a0122..d1977031 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 d14f33a2..aae461b5 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 e36f1892..e5377cef 100644
--- a/win81x64-pro.json
+++ b/win81x64-pro.json
@@ -66,7 +66,7 @@
         [
           "setextradata",
           "{{.Name}}",
-          "VBoxInternal/CPUM/CMPXCHG16B",
+          "VBoxInternal/CPUM/IsaExts/CMPXCHG16B",
           "1"
         ]
       ],