drop (R) from Intel GPUs

None of the other vendors do this, and it just makes the headers longer

83 files changed, 184 insertions, 184 deletions

diff --git a/gen4-glxinfo-10.1.js b/gen4-glxinfo-10.1.js
index 7b26efa..5905aee 100644
--- a/gen4-glxinfo-10.1.js
+++ b/gen4-glxinfo-10.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen4-glxinfo-10.2.js b/gen4-glxinfo-10.2.js
index f696caa..4939748 100644
--- a/gen4-glxinfo-10.2.js
+++ b/gen4-glxinfo-10.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen4-glxinfo-10.3.js b/gen4-glxinfo-10.3.js
index 566cecb..ecc6a44 100644
--- a/gen4-glxinfo-10.3.js
+++ b/gen4-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-10.4.js b/gen4-glxinfo-10.4.js
index 6d19c0e..0ab2d12 100644
--- a/gen4-glxinfo-10.4.js
+++ b/gen4-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-10.5.js b/gen4-glxinfo-10.5.js
index daec1eb..a573823 100644
--- a/gen4-glxinfo-10.5.js
+++ b/gen4-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-10.6.js b/gen4-glxinfo-10.6.js
index d3ba128..f9af081 100644
--- a/gen4-glxinfo-10.6.js
+++ b/gen4-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-11.0.js b/gen4-glxinfo-11.0.js
index 64f30a8..5c09dda 100644
--- a/gen4-glxinfo-11.0.js
+++ b/gen4-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-11.1.js b/gen4-glxinfo-11.1.js
index cf63100..d782b86 100644
--- a/gen4-glxinfo-11.1.js
+++ b/gen4-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-11.2.js b/gen4-glxinfo-11.2.js
index 46b0460..d6cd351 100644
--- a/gen4-glxinfo-11.2.js
+++ b/gen4-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-12.0.js b/gen4-glxinfo-12.0.js
index 4d01460..e5c9487 100644
--- a/gen4-glxinfo-12.0.js
+++ b/gen4-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-13.0.js b/gen4-glxinfo-13.0.js
index 94b4714..7f1b972 100644
--- a/gen4-glxinfo-13.0.js
+++ b/gen4-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4-glxinfo-17.0.js b/gen4-glxinfo-17.0.js
index 375ff72..b60e401 100644
--- a/gen4-glxinfo-17.0.js
+++ b/gen4-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) 965G / X3000", [
+register("Intel Open Source Technology Center", "Intel 965G / X3000", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen4.5-glxinfo-10.1.js b/gen4.5-glxinfo-10.1.js
index a9f6154..f0c87bd 100644
--- a/gen4.5-glxinfo-10.1.js
+++ b/gen4.5-glxinfo-10.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen4.5-glxinfo-10.2.js b/gen4.5-glxinfo-10.2.js
index f496176..921e84e 100644
--- a/gen4.5-glxinfo-10.2.js
+++ b/gen4.5-glxinfo-10.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen4.5-glxinfo-10.3.js b/gen4.5-glxinfo-10.3.js
index 7b6adf6..0e87f4c 100644
--- a/gen4.5-glxinfo-10.3.js
+++ b/gen4.5-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-10.4.js b/gen4.5-glxinfo-10.4.js
index 9a2e871..90e37d3 100644
--- a/gen4.5-glxinfo-10.4.js
+++ b/gen4.5-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-10.5.js b/gen4.5-glxinfo-10.5.js
index b04223f..844352e 100644
--- a/gen4.5-glxinfo-10.5.js
+++ b/gen4.5-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-10.6.js b/gen4.5-glxinfo-10.6.js
index 8e55b58..8108177 100644
--- a/gen4.5-glxinfo-10.6.js
+++ b/gen4.5-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-11.0.js b/gen4.5-glxinfo-11.0.js
index 8a80585..714fd21 100644
--- a/gen4.5-glxinfo-11.0.js
+++ b/gen4.5-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-11.1.js b/gen4.5-glxinfo-11.1.js
index 9e0ca9f..f528b62 100644
--- a/gen4.5-glxinfo-11.1.js
+++ b/gen4.5-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-11.2.js b/gen4.5-glxinfo-11.2.js
index 863d209..3a86a05 100644
--- a/gen4.5-glxinfo-11.2.js
+++ b/gen4.5-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-12.0.js b/gen4.5-glxinfo-12.0.js
index 092e34e..07b2e97 100644
--- a/gen4.5-glxinfo-12.0.js
+++ b/gen4.5-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen4.5-glxinfo-13.0.js b/gen4.5-glxinfo-13.0.js
index 373a96c..cb8e3ab 100644
--- a/gen4.5-glxinfo-13.0.js
+++ b/gen4.5-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel\u00ae GM45 Express", [
+register("Intel Open Source Technology Center", "Intel GM45 Express", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-10.1.js b/gen5-glxinfo-10.1.js
index 4115561..ca5abad 100644
--- a/gen5-glxinfo-10.1.js
+++ b/gen5-glxinfo-10.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen5-glxinfo-10.2.js b/gen5-glxinfo-10.2.js
index 4672b13..fad0534 100644
--- a/gen5-glxinfo-10.2.js
+++ b/gen5-glxinfo-10.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "core": false, 
         "extensions": [
diff --git a/gen5-glxinfo-10.3.js b/gen5-glxinfo-10.3.js
index 5bb1541..fe4128b 100644
--- a/gen5-glxinfo-10.3.js
+++ b/gen5-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-10.4.js b/gen5-glxinfo-10.4.js
index cfddf9b..23a33d7 100644
--- a/gen5-glxinfo-10.4.js
+++ b/gen5-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-10.5.js b/gen5-glxinfo-10.5.js
index d5ef66d..29f5979 100644
--- a/gen5-glxinfo-10.5.js
+++ b/gen5-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-10.6.js b/gen5-glxinfo-10.6.js
index b581fdb..3559720 100644
--- a/gen5-glxinfo-10.6.js
+++ b/gen5-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-11.0.js b/gen5-glxinfo-11.0.js
index 57fe27c..bf26ee2 100644
--- a/gen5-glxinfo-11.0.js
+++ b/gen5-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-11.1.js b/gen5-glxinfo-11.1.js
index a973026..1c051b9 100644
--- a/gen5-glxinfo-11.1.js
+++ b/gen5-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-11.2.js b/gen5-glxinfo-11.2.js
index 0b7ca11..2c9b715 100644
--- a/gen5-glxinfo-11.2.js
+++ b/gen5-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-12.0.js b/gen5-glxinfo-12.0.js
index 0c4d133..ca42a9e 100644
--- a/gen5-glxinfo-12.0.js
+++ b/gen5-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-13.0.js b/gen5-glxinfo-13.0.js
index 21ca681..23c49ac 100644
--- a/gen5-glxinfo-13.0.js
+++ b/gen5-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen5-glxinfo-17.0.js b/gen5-glxinfo-17.0.js
index 7a6a29e..cc1fce0 100644
--- a/gen5-glxinfo-17.0.js
+++ b/gen5-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ironlake", [
+register("Intel Open Source Technology Center", "Intel Ironlake", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen6-glxinfo-10.3.js b/gen6-glxinfo-10.3.js
index 0d06408..9e4733c 100644
--- a/gen6-glxinfo-10.3.js
+++ b/gen6-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-10.4.js b/gen6-glxinfo-10.4.js
index b0f2207..63065d8 100644
--- a/gen6-glxinfo-10.4.js
+++ b/gen6-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-10.5.js b/gen6-glxinfo-10.5.js
index 505bf7b..905971b 100644
--- a/gen6-glxinfo-10.5.js
+++ b/gen6-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-10.6.js b/gen6-glxinfo-10.6.js
index a49be8d..dd9d2e0 100644
--- a/gen6-glxinfo-10.6.js
+++ b/gen6-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-11.0.js b/gen6-glxinfo-11.0.js
index 993280c..681339a 100644
--- a/gen6-glxinfo-11.0.js
+++ b/gen6-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-11.1.js b/gen6-glxinfo-11.1.js
index 13dbbe0..49ee1bb 100644
--- a/gen6-glxinfo-11.1.js
+++ b/gen6-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-11.2.js b/gen6-glxinfo-11.2.js
index 5473516..2be163e 100644
--- a/gen6-glxinfo-11.2.js
+++ b/gen6-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-12.0.js b/gen6-glxinfo-12.0.js
index 9316809..a325ac3 100644
--- a/gen6-glxinfo-12.0.js
+++ b/gen6-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-13.0.js b/gen6-glxinfo-13.0.js
index 4f6d181..d6ea4bf 100644
--- a/gen6-glxinfo-13.0.js
+++ b/gen6-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen6-glxinfo-17.0.js b/gen6-glxinfo-17.0.js
index 85b1b97..0b00ab1 100644
--- a/gen6-glxinfo-17.0.js
+++ b/gen6-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Sandybridge (HD 2000/3000)", [
+register("Intel Open Source Technology Center", "Intel Sandybridge (HD 2000/3000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen7-glxinfo-10.2.js b/gen7-glxinfo-10.2.js
index b56812c..4f05ed4 100644
--- a/gen7-glxinfo-10.2.js
+++ b/gen7-glxinfo-10.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "core": true, 
         "extensions": [
diff --git a/gen7-glxinfo-10.3.js b/gen7-glxinfo-10.3.js
index 9c93629..1008cb0 100644
--- a/gen7-glxinfo-10.3.js
+++ b/gen7-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-10.4.js b/gen7-glxinfo-10.4.js
index 108efaf..6bfa5d7 100644
--- a/gen7-glxinfo-10.4.js
+++ b/gen7-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-10.5.js b/gen7-glxinfo-10.5.js
index a627243..79bb5bc 100644
--- a/gen7-glxinfo-10.5.js
+++ b/gen7-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-10.6.js b/gen7-glxinfo-10.6.js
index 39e5435..940e7ee 100644
--- a/gen7-glxinfo-10.6.js
+++ b/gen7-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-11.0.js b/gen7-glxinfo-11.0.js
index d728ecc..c78568e 100644
--- a/gen7-glxinfo-11.0.js
+++ b/gen7-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-11.1.js b/gen7-glxinfo-11.1.js
index 3f8acb6..fd0c097 100644
--- a/gen7-glxinfo-11.1.js
+++ b/gen7-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-11.2.js b/gen7-glxinfo-11.2.js
index 70b6f0b..0964615 100644
--- a/gen7-glxinfo-11.2.js
+++ b/gen7-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-12.0.js b/gen7-glxinfo-12.0.js
index f850505..3ba460b 100644
--- a/gen7-glxinfo-12.0.js
+++ b/gen7-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-13.0.js b/gen7-glxinfo-13.0.js
index 8d3a8c9..65a2db5 100644
--- a/gen7-glxinfo-13.0.js
+++ b/gen7-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7-glxinfo-17.0.js b/gen7-glxinfo-17.0.js
index ba8c1df..6d5140c 100644
--- a/gen7-glxinfo-17.0.js
+++ b/gen7-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen7-ivb-glxinfo-10.1.js b/gen7-ivb-glxinfo-10.1.js
index 931b930..35a233e 100644
--- a/gen7-ivb-glxinfo-10.1.js
+++ b/gen7-ivb-glxinfo-10.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Ivybridge (HD 2500 / 4000)", [
+register("Intel Open Source Technology Center", "Intel Ivybridge (HD 2500 / 4000)", [
     {
         "core": true, 
         "extensions": [
diff --git a/gen7.5-glxinfo-10.1.js b/gen7.5-glxinfo-10.1.js
index bb70c69..214cfa5 100644
--- a/gen7.5-glxinfo-10.1.js
+++ b/gen7.5-glxinfo-10.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "core": true, 
         "extensions": [
diff --git a/gen7.5-glxinfo-10.2.js b/gen7.5-glxinfo-10.2.js
index 1b69490..27c44dd 100644
--- a/gen7.5-glxinfo-10.2.js
+++ b/gen7.5-glxinfo-10.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "core": true, 
         "extensions": [
diff --git a/gen7.5-glxinfo-10.3.js b/gen7.5-glxinfo-10.3.js
index d6bf5d0..be86a4a 100644
--- a/gen7.5-glxinfo-10.3.js
+++ b/gen7.5-glxinfo-10.3.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-10.4.js b/gen7.5-glxinfo-10.4.js
index b4d045d..357c4fd 100644
--- a/gen7.5-glxinfo-10.4.js
+++ b/gen7.5-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-10.5.js b/gen7.5-glxinfo-10.5.js
index 57a2d17..a8296f7 100644
--- a/gen7.5-glxinfo-10.5.js
+++ b/gen7.5-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-10.6.js b/gen7.5-glxinfo-10.6.js
index 5c4ad39..3210e38 100644
--- a/gen7.5-glxinfo-10.6.js
+++ b/gen7.5-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-11.0.js b/gen7.5-glxinfo-11.0.js
index fc292eb..3786cdc 100644
--- a/gen7.5-glxinfo-11.0.js
+++ b/gen7.5-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-11.1.js b/gen7.5-glxinfo-11.1.js
index 08df015..2c4dbeb 100644
--- a/gen7.5-glxinfo-11.1.js
+++ b/gen7.5-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-11.2.js b/gen7.5-glxinfo-11.2.js
index b9ab49b..05d1851 100644
--- a/gen7.5-glxinfo-11.2.js
+++ b/gen7.5-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-12.0.js b/gen7.5-glxinfo-12.0.js
index bb3e0a6..d88aba0 100644
--- a/gen7.5-glxinfo-12.0.js
+++ b/gen7.5-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-13.0.js b/gen7.5-glxinfo-13.0.js
index 0d3ec06..6dfec5e 100644
--- a/gen7.5-glxinfo-13.0.js
+++ b/gen7.5-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen7.5-glxinfo-17.0.js b/gen7.5-glxinfo-17.0.js
index e724e05..da25d0d 100644
--- a/gen7.5-glxinfo-17.0.js
+++ b/gen7.5-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)", [
+register("Intel Open Source Technology Center", "Intel Haswell (HD 4x00/5000, Iris 5x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen8-glxinfo-10.4.js b/gen8-glxinfo-10.4.js
index a020ec7..e8f52e2 100644
--- a/gen8-glxinfo-10.4.js
+++ b/gen8-glxinfo-10.4.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-10.5.js b/gen8-glxinfo-10.5.js
index f09aa87..9fba1a6 100644
--- a/gen8-glxinfo-10.5.js
+++ b/gen8-glxinfo-10.5.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-10.6.js b/gen8-glxinfo-10.6.js
index fb11fe3..06bf69d 100644
--- a/gen8-glxinfo-10.6.js
+++ b/gen8-glxinfo-10.6.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-11.0.js b/gen8-glxinfo-11.0.js
index 25de6c0..194e2ef 100644
--- a/gen8-glxinfo-11.0.js
+++ b/gen8-glxinfo-11.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-11.1.js b/gen8-glxinfo-11.1.js
index f734971..db164d8 100644
--- a/gen8-glxinfo-11.1.js
+++ b/gen8-glxinfo-11.1.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-11.2.js b/gen8-glxinfo-11.2.js
index d24a7df..ef4b8f4 100644
--- a/gen8-glxinfo-11.2.js
+++ b/gen8-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-12.0.js b/gen8-glxinfo-12.0.js
index 9d4f0c8..ce1eb8b 100644
--- a/gen8-glxinfo-12.0.js
+++ b/gen8-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-13.0.js b/gen8-glxinfo-13.0.js
index 4e0d886..b3be4b0 100644
--- a/gen8-glxinfo-13.0.js
+++ b/gen8-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen8-glxinfo-17.0.js b/gen8-glxinfo-17.0.js
index c2afb0b..56f5f16 100644
--- a/gen8-glxinfo-17.0.js
+++ b/gen8-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)", [
+register("Intel Open Source Technology Center", "Intel Broadwell (HD 5x00/6000, Iris 6x00)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/gen9-glxinfo-11.2.js b/gen9-glxinfo-11.2.js
index 4d5d3f7..09e8eaa 100644
--- a/gen9-glxinfo-11.2.js
+++ b/gen9-glxinfo-11.2.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Skylake (HD 5xx)", [
+register("Intel Open Source Technology Center", "Intel Skylake (HD 5xx)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen9-glxinfo-12.0.js b/gen9-glxinfo-12.0.js
index b827e02..42aa81f 100644
--- a/gen9-glxinfo-12.0.js
+++ b/gen9-glxinfo-12.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Skylake (HD 5xx)", [
+register("Intel Open Source Technology Center", "Intel Skylake (HD 5xx)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen9-glxinfo-13.0.js b/gen9-glxinfo-13.0.js
index d51721e..e6f936e 100644
--- a/gen9-glxinfo-13.0.js
+++ b/gen9-glxinfo-13.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Skylake (HD 5xx)", [
+register("Intel Open Source Technology Center", "Intel Skylake (HD 5xx)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1", 
diff --git a/gen9-glxinfo-17.0.js b/gen9-glxinfo-17.0.js
index 0acc356..8a22a45 100644
--- a/gen9-glxinfo-17.0.js
+++ b/gen9-glxinfo-17.0.js
@@ -1,4 +1,4 @@
-register("Intel Open Source Technology Center", "Intel(R) Skylake (HD 5xx)", [
+register("Intel Open Source Technology Center", "Intel Skylake (HD 5xx)", [
     {
         "extensions": [
             "GL_3DFX_texture_compression_FXT1",
diff --git a/glxinfo.js b/glxinfo.js
index 1ba136c..4fb59d3 100644
--- a/glxinfo.js
+++ b/glxinfo.js
@@ -21,12 +21,12 @@ var VERSIONS = {
   "Mesa 10.1.0": {
     "LLVMpipe": "llvmpipe-glxinfo-10.1.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.1.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.1.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.1.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "snb-glxinfo-10.1.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-ivb-glxinfo-10.1.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.1.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.1.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.1.js",
+    "Intel Ironlake": "gen5-glxinfo-10.1.js",
+    "Intel Sandybridge (HD 2000/3000)": "snb-glxinfo-10.1.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-ivb-glxinfo-10.1.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.1.js",
 
     "NVIDIA Riva TNT/TNT2": "nv05-glxinfo-10.1.js",
     "NVIDIA NV4x (GeForce 6, 7)": "nv4c-glxinfo-10.1.js",
@@ -46,12 +46,12 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-10.2.js",
     "SoftPipe": "softpipe-glxinfo-10.2.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.2.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.2.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.2.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "snb-glxinfo-10.2.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.2.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.2.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.2.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.2.js",
+    "Intel Ironlake": "gen5-glxinfo-10.2.js",
+    "Intel Sandybridge (HD 2000/3000)": "snb-glxinfo-10.2.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.2.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.2.js",
 
     "NVIDIA Riva TNT/TNT2": "nv05-glxinfo-10.2.js",
     "NVIDIA GeForce 2, 4MX": "nv17-glxinfo-10.2.js",
@@ -72,12 +72,12 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-10.3.js",
     "SoftPipe": "softpipe-glxinfo-10.3.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.3.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.3.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.3.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.3.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.3.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.3.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.3.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.3.js",
+    "Intel Ironlake": "gen5-glxinfo-10.3.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.3.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.3.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.3.js",
 
     //"NVIDIA Riva TNT/TNT2": "nv05-glxinfo-10.3.js",
     "NVIDIA GeForce 2, 4MX": "nv17-glxinfo-10.3.js",
@@ -98,13 +98,13 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-10.4.js",
     "SoftPipe": "softpipe-glxinfo-10.4.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.4.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.4.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.4.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.4.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.4.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.4.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.4.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.4.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.4.js",
+    "Intel Ironlake": "gen5-glxinfo-10.4.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.4.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.4.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.4.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.4.js",
 
     //"NVIDIA Riva TNT/TNT2": "nv05-glxinfo-10.3.js",
     //"NVIDIA GeForce 2, 4MX": "nv17-glxinfo-10.3.js",
@@ -125,13 +125,13 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-10.5.js",
     "SoftPipe": "softpipe-glxinfo-10.5.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.5.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.5.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.5.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.5.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.5.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.5.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.5.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.5.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.5.js",
+    "Intel Ironlake": "gen5-glxinfo-10.5.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.5.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.5.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.5.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.5.js",
 
     "NVIDIA NV4x (GeForce 6, 7)": "nv4b-glxinfo-10.5.js",
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-10.5.js",
@@ -149,13 +149,13 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-10.6.js",
     "SoftPipe": "softpipe-glxinfo-10.6.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-10.6.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-10.6.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-10.6.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.6.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.6.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.6.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.6.js",
+    "Intel 965G / X3000": "gen4-glxinfo-10.6.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-10.6.js",
+    "Intel Ironlake": "gen5-glxinfo-10.6.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-10.6.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-10.6.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-10.6.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-10.6.js",
 
     "NVIDIA NV4x (GeForce 6, 7)": "nv44-glxinfo-10.6.js",
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-10.6.js",
@@ -174,13 +174,13 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-11.0.js",
     "SoftPipe": "softpipe-glxinfo-11.0.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-11.0.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-11.0.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-11.0.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.0.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.0.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.0.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.0.js",
+    "Intel 965G / X3000": "gen4-glxinfo-11.0.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-11.0.js",
+    "Intel Ironlake": "gen5-glxinfo-11.0.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.0.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.0.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.0.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.0.js",
 
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-11.0.js",
     "NVIDIA GT21x (GeForce 200, 300)": "nva3-glxinfo-11.0.js",
@@ -199,13 +199,13 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-11.1.js",
     "SoftPipe": "softpipe-glxinfo-11.1.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-11.1.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-11.1.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-11.1.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.1.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.1.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.1.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.1.js",
+    "Intel 965G / X3000": "gen4-glxinfo-11.1.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-11.1.js",
+    "Intel Ironlake": "gen5-glxinfo-11.1.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.1.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.1.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.1.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.1.js",
 
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-11.1.js",
     "NVIDIA GT21x (GeForce 200, 300)": "nva3-glxinfo-11.1.js",
@@ -225,14 +225,14 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-11.2.js",
     "SoftPipe": "softpipe-glxinfo-11.2.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-11.2.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-11.2.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-11.2.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.2.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.2.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.2.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.2.js",
-    "Intel(R) Skylake (HD 5xx)": "gen9-glxinfo-11.2.js",
+    "Intel 965G / X3000": "gen4-glxinfo-11.2.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-11.2.js",
+    "Intel Ironlake": "gen5-glxinfo-11.2.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-11.2.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-11.2.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-11.2.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-11.2.js",
+    "Intel Skylake (HD 5xx)": "gen9-glxinfo-11.2.js",
 
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-11.2.js",
     "NVIDIA GT21x (GeForce 200, 300)": "nva3-glxinfo-11.2.js",
@@ -251,14 +251,14 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-12.0.js",
     "SoftPipe": "softpipe-glxinfo-12.0.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-12.0.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-12.0.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-12.0.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-12.0.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-12.0.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-12.0.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-12.0.js",
-    "Intel(R) Skylake (HD 5xx)": "gen9-glxinfo-12.0.js",
+    "Intel 965G / X3000": "gen4-glxinfo-12.0.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-12.0.js",
+    "Intel Ironlake": "gen5-glxinfo-12.0.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-12.0.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-12.0.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-12.0.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-12.0.js",
+    "Intel Skylake (HD 5xx)": "gen9-glxinfo-12.0.js",
 
     "NVIDIA NV3x (GeForce FX)": "nv34-glxinfo-12.0.js",
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-12.0.js",
@@ -278,14 +278,14 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-13.0.js",
     "SoftPipe": "softpipe-glxinfo-13.0.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-13.0.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-13.0.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-13.0.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-13.0.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-13.0.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-13.0.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-13.0.js",
-    "Intel(R) Skylake (HD 5xx)": "gen9-glxinfo-13.0.js",
+    "Intel 965G / X3000": "gen4-glxinfo-13.0.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-13.0.js",
+    "Intel Ironlake": "gen5-glxinfo-13.0.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-13.0.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-13.0.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-13.0.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-13.0.js",
+    "Intel Skylake (HD 5xx)": "gen9-glxinfo-13.0.js",
 
     "NVIDIA NV3x (GeForce FX)": "nv34-glxinfo-13.0.js",
     "NVIDIA G80-G98 (GeForce 8, 9)": "nv96-glxinfo-13.0.js",
@@ -305,14 +305,14 @@ var VERSIONS = {
     "LLVMPipe": "llvmpipe-glxinfo-17.0.js",
     "SoftPipe": "softpipe-glxinfo-17.0.js",
 
-    "Intel(R) 965G / X3000": "gen4-glxinfo-17.0.js",
-    "Intel\u00ae GM45 Express": "gen4.5-glxinfo-17.0.js",
-    "Intel(R) Ironlake": "gen5-glxinfo-17.0.js",
-    "Intel(R) Sandybridge (HD 2000/3000)": "gen6-glxinfo-17.0.js",
-    "Intel(R) Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-17.0.js",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-17.0.js",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-17.0.js",
-    "Intel(R) Skylake (HD 5xx)": "gen9-glxinfo-17.0.js",
+    "Intel 965G / X3000": "gen4-glxinfo-17.0.js",
+    "Intel GM45 Express": "gen4.5-glxinfo-17.0.js",
+    "Intel Ironlake": "gen5-glxinfo-17.0.js",
+    "Intel Sandybridge (HD 2000/3000)": "gen6-glxinfo-17.0.js",
+    "Intel Ivybridge (HD 2500 / 4000)": "gen7-glxinfo-17.0.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "gen7.5-glxinfo-17.0.js",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)": "gen8-glxinfo-17.0.js",
+    "Intel Skylake (HD 5xx)": "gen9-glxinfo-17.0.js",
 
     "NVIDIA NV3x (GeForce FX)": "nv34-glxinfo-17.0.js",
     "NVIDIA NV4x (GeForce 6, 7)": "nv4a-glxinfo-17.0.js",
@@ -330,7 +330,7 @@ var VERSIONS = {
     //"Adreno A4xx": "a420-glxinfo-12.0.js",
   },
   "Vendor": {
-    "Intel(R) Sandybridge (HD 2000/3000)": "snb-glxinfo-windows.js",
+    "Intel Sandybridge (HD 2000/3000)": "snb-glxinfo-windows.js",
 
     "AMD Southern/Sea Islands": "hd7900-fglrx-14.20-glxinfo.js",
     "AMD Evergreen/Northern Islands": "hd5670-fglrx-14.20-glxinfo.js",
@@ -345,21 +345,21 @@ var VERSIONS = {
     "Adreno A4xx": "a420-qcom-127.js",
   },
   "Apple": {
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": "hsw-apple-10.11-glxinfo.js",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)": "hsw-apple-10.11-glxinfo.js",
   },
 };
 
 var HWS = [
   ["Software", ["LLVMPipe", "SoftPipe"]],
   ["Intel", [
-    "Intel(R) 965G / X3000",
-    "Intel\u00ae GM45 Express",
-    "Intel(R) Ironlake",
-    "Intel(R) Sandybridge (HD 2000/3000)",
-    "Intel(R) Ivybridge (HD 2500 / 4000)",
-    "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)",
-    "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)",
-    "Intel(R) Skylake (HD 5xx)",
+    "Intel 965G / X3000",
+    "Intel GM45 Express",
+    "Intel Ironlake",
+    "Intel Sandybridge (HD 2000/3000)",
+    "Intel Ivybridge (HD 2500 / 4000)",
+    "Intel Haswell (HD 4x00/5000, Iris 5x00)",
+    "Intel Broadwell (HD 5x00/6000, Iris 6x00)",
+    "Intel Skylake (HD 5xx)",
   ]],
   ["NVIDIA", [
     "NVIDIA Riva TNT/TNT2",
@@ -387,25 +387,25 @@ var HWS = [
 ];
 
 var UNSUPPORTED = {
-  "Intel(R) Broadwell (HD 5x00/6000, Iris 6x00)": [
+  "Intel Broadwell (HD 5x00/6000, Iris 6x00)": [
     "GL_ARB_shader_stencil_export",
     "GL_KHR_texture_compression_astc_hdr",
     "GL_KHR_texture_compression_astc_ldr",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel(R) Haswell (HD 4x00/5000, Iris 5x00)": [
+  "Intel Haswell (HD 4x00/5000, Iris 5x00)": [
     "GL_ARB_shader_stencil_export",
     "GL_KHR_texture_compression_astc_hdr",
     "GL_KHR_texture_compression_astc_ldr",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel(R) Ivybridge (HD 2500 / 4000)": [
+  "Intel Ivybridge (HD 2500 / 4000)": [
     "GL_ARB_shader_stencil_export",
     "GL_KHR_texture_compression_astc_hdr",
     "GL_KHR_texture_compression_astc_ldr",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel(R) Sandybridge (HD 2000/3000)": [
+  "Intel Sandybridge (HD 2000/3000)": [
     "GL_ARB_conservative_depth",
     "GL_ARB_draw_indirect",
     "GL_ARB_multi_draw_indirect",
@@ -418,7 +418,7 @@ var UNSUPPORTED = {
     "GL_AMD_conservative_depth",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel(R) Ironlake": [
+  "Intel Ironlake": [
     "GL_ARB_conservative_depth",
     "GL_ARB_draw_indirect",
     "GL_ARB_multi_draw_indirect",
@@ -432,7 +432,7 @@ var UNSUPPORTED = {
     "GL_AMD_conservative_depth",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel\u00ae GM45 Express": [
+  "Intel GM45 Express": [
     "GL_ARB_conservative_depth",
     "GL_ARB_draw_indirect",
     "GL_ARB_multi_draw_indirect",
@@ -446,7 +446,7 @@ var UNSUPPORTED = {
     "GL_AMD_conservative_depth",
     "GL_AMD_shader_stencil_export",
   ],
-  "Intel(R) 965G / X3000": [
+  "Intel 965G / X3000": [
     "GL_ARB_conservative_depth",
     "GL_ARB_draw_indirect",
     "GL_ARB_multi_draw_indirect",