diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index cb478903e..6b58f6e24 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index cb478903e..6b58f6e24 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index cb478903e..6b58f6e24 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index cb478903e..6b58f6e24 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index cb478903e..6b58f6e24 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index cb478903e..6b58f6e24 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -669,61 +669,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1505,7 +1505,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {
diff --git a/share/apps.json b/share/apps.json
index 605b24c43..a9dd528c6 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -670,61 +670,61 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": [ "Java" ]
 		},
-		"BM HTTP Server": {
+		"IBM HTTP Server": {
 			"cats": [ "22" ],
-			"headers": { "Server": "BM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server" }
 		},
-		"BM WebSphere Portal": {
+		"IBM WebSphere Portal": {
 			"cats": [ "1" ],
 			"headers": { "BM-Web2-Location": ".*" },
 			"url": "/wps/",
 			"implies": [ "Java" ]
 		},
-		"BM WebSphere Commerce": {
+		"IBM WebSphere Commerce": {
 			"cats": [ "6" ],
 			"url": "/wcs/",
 			"implies": [ "Java" ]
 		},
-		"IS": {
+		"IIS": {
 			"cats": [ "22" ],
-			"headers": { "Server": "IS" },
+			"headers": { "Server": "IIS" },
 			"implies": [ "Windows Server" ]
 		},
-		"mpressCMS": {
+		"ImpressCMS": {
 			"cats": [ "1" ],
-			"script": "nclude/linkexternal\\.js",
-			"meta": { "generator": "mpressCMS" },
-			"headers": { "X-Powered-By": "mpressCMS" },
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS" },
 			"implies": [ "PHP" ]
 		},
-		"mpressPages": {
+		"ImpressPages": {
 			"cats": [ "1" ],
-			"meta": { "generator": "mpressPages" },
+			"meta": { "generator": "impressPages" },
 			"implies": [ "PHP" ]
 		},
-		"ndexhibit": {
+		"Indexhibit": {
 			"cats": [ "1" ],
 			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache" ]
 		},
-		"nstantCMS": {
+		"InstantCMS": {
 			"cats": [ "1" ],
 			"meta": { "generator": "nstantCMS" }
 		},
-		"ntershop": {
+		"Intershop": {
 			"cats": [ "6" ],
 			"url": "s-bin|INTERSHOP",
 			"script": "s-bin|INTERSHOP"
 		},
-		"PB": {
+		"IPB": {
 			"cats": [ "2" ],
 			"script": "jscripts/ips_",
 			"env": "^IPBoard",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
-		"Web": {
+		"iWeb": {
 			"cats": [ "20" ],
-			"meta": { "generator": "Web" }
+			"meta": { "generator": "iWeb" }
 		},
 		"Jalios": {
 			"cats": [ "1" ],
@@ -1506,7 +1506,7 @@
 			"headers": { "X-Powered-By": "Vanilla" }
 		},
 		"Varnish": {
-			"cats": [ "22" ],
+			"cats": [ "23" ],
 			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
 		},
 		"vBulletin": {