diff --git a/nmap-os-db b/nmap-os-db
index 0b5b5569c..c333af62b 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -3201,7 +3201,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
 # AudioCodes Mediant 1000
 Fingerprint AudioCodes Mediant 1000 VoIP gateway
-Class AudioCodes | embedded || VoIP gateway
+Class AudioCodes | embedded || VoIP adapter
 SEQ(SP=C-16%GCD=1E848|3D090|5B8D8|7A120|98968%ISR=9F-A9%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW1NNSNNT11%O2=M578NW1NNSNNT11%O3=M280NW1NNT11%O4=M5B4NW1NNSNNT11%O5=M218NW1NNSNNT11%O6=M109NNSNNT11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -3219,7 +3219,7 @@ IE(DFI=N%T=FA-104%TG=FF%CD=S)
 # Audiocodes MP-118-4FXS4FXO VoIP Gate
 # Audiocodes MP-114 FXO
 Fingerprint Audiocodes MP-114 or MP-118 VoIP gateway
-Class AudioCodes | embedded || VoIP gateway
+Class AudioCodes | embedded || VoIP adapter
 SEQ(SP=C-16%GCD=1E848|3D090|5B8D8|7A120|98968%ISR=9F-A9%TS=A)
 OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
 WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
@@ -3320,7 +3320,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Avaya G360 Media Gateway running software version 26.36.0
 Fingerprint Avaya G350 Media Gateway (VoIP gateway)
-Class Avaya | embedded || VoIP gateway
+Class Avaya | embedded || VoIP adapter
 SEQ(SP=94-9E%GCD=1-6%ISR=9B-A5%TI=I%II=RI%SS=O|S%TS=U)
 OPS(O1=M550%O2=M550%O3=M550%O4=M550%O5=M550%O6=M550)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -3338,7 +3338,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Avaya G700 Telephony Media Gateway
 # Konica Minolta 7145 printer
 Fingerprint Avaya G700 Telephony Media Gateway
-Class Avaya | embedded || VoIP gateway
+Class Avaya | embedded || VoIP adapter
 SEQ(SP=18-1C%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=9D-A2%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M200NW0NNT11%O2=M200NW0NNT11%O3=M200NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=M200NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -3355,7 +3355,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Avaya IP Office IP403
 Fingerprint Avaya Office IP403 VoIP gateway
-Class Avaya | embedded || VoIP gateway
+Class Avaya | embedded || VoIP adapter
 SEQ(SP=11-2D%GCD=10000|20000|30000|40000|50000%ISR=CA-D4%TI=I%II=RI%SS=O%TS=U)
 OPS(O1=M400%O2=M400%O3=M400%O4=M400%O5=M400%O6=M400)
 WIN(W1=1111%W2=1111%W3=1111%W4=1111%W5=1111%W6=1111)
@@ -3373,7 +3373,7 @@ IE(DFI=S%T=23-3D%TG=40%CD=S)
 # Avaya IP500, Firmware 4.1 (9)
 # avaya IP Office 500 . mixed-type PABX (analog + voip)
 Fingerprint Avaya Office IP500 VoIP gateway
-Class Avaya | embedded || VoIP gateway
+Class Avaya | embedded || VoIP adapter
 SEQ(SP=0-13%GCD=10000|20000|30000|40000|50000|650000|CA0000|12F0000|1940000|1F90000%ISR=CB-D5%TI=I%II=RI%SS=O|S%TS=U)
 OPS(O1=M400%O2=M400%O3=M400%O4=M400%O5=M400%O6=M400)
 WIN(W1=1111%W2=1111%W3=1111%W4=1111%W5=1111%W6=1111)
@@ -5279,7 +5279,7 @@ IE(DFI=S%T=FB-105%TG=FF%CD=S)
 
 # Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.7.O
 Fingerprint Cisco VPN 3000 Concentrator VPN platform (software version 4.1.7.O)
-Class Cisco | embedded || encryption accelerator
+Class Cisco | embedded || proxy server
 SEQ(SP=D3-DD%GCD=1-6%ISR=DB-E5%TI=RD%II=RI%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -5296,7 +5296,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=S)
 
 # Cisco VPN Concentrator, software revision: "Cisco Systems, Inc./VPN 3000 Concentrator Version 4.7.2.D Dec 20 2005 15:26:54"
 Fingerprint Cisco VPN 3000 Concentrator VPN platform (software version 4.7.2.D)
-Class Cisco | embedded || encryption accelerator
+Class Cisco | embedded || proxy server
 SEQ(SP=D0-DA%GCD=1-6%ISR=DA-E4%TI=I%II=RI%SS=O|S%TS=1|2)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -5313,7 +5313,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=S)
 
 # Cisco Concentrator 3030
 Fingerprint Cisco VPN 3030 Concentrator VPN platform
-Class Cisco | embedded || encryption accelerator
+Class Cisco | embedded || proxy server
 SEQ(SP=D6-E0%GCD=1-6%ISR=D8-E2%TI=RD%II=RI%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -5330,7 +5330,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=S)
 
 # Cisco Systems, Inc./VPN 3000 Concentrator Version 4.7.2.F (VPN Concentrator Type: 3030)
 Fingerprint Cisco VPN 3030 Concentrator VPN platform (software 4.7.2.F)
-Class Cisco | embedded || encryption accelerator
+Class Cisco | embedded || proxy server
 SEQ(SP=CE-D8%GCD=1-6%ISR=CF-D9%TI=RD%II=RI%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -5686,7 +5686,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Cisco Micro Webserver 200, Cisco MicroWeb II, Software Version: Eclipse 1.0.1(100)
 # Tektronix oscilloscope model TDS-3034B, Firmware V3.29. (c) 2001
 Fingerprint Cisco Micro Webserver 200, HP WP110 print server, Tektronix TDS3034B oscilloscope, or Xerox Document Centre 405 printer
-Class Cisco | embedded || web server
+Class Cisco | embedded || general purpose
 Class HP | embedded || print server
 Class Tektronix | embedded || specialized
 Class Xerox | embedded || printer
@@ -6649,7 +6649,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Citrix Access Gateway model 2000, software release 4.5.8. Rebadged Supermicro 5013C-M. The operating system itself is some form of Linux.
 Fingerprint Citrix Access Gateway VPN gateway
-Class Citrix | embedded || encryption accelerator
+Class Citrix | embedded || proxy server
 SEQ(SP=C6-D0%GCD=1-6%ISR=CC-D6%TI=Z%II=I%TS=U)
 OPS(O1=M586NNSNW0%O2=M586NNSNW0%O3=M586NW0%O4=M586NNSNW0%O5=M586NNSNW0%O6=M586NNS)
 WIN(W1=1618%W2=1618%W3=1618%W4=1618%W5=1618%W6=1618)
@@ -6792,8 +6792,8 @@ IE(DFI=N%T=FA-104%TG=FF%CD=S)
 # Ethernet to wall socket connector provided by BT. Runs 10Mbps ethernet through house electrics.
 # Acbel Polytech Ethernet over Powerline 200Mbit/sec bridge
 Fingerprint AcBel or Comtrend powerline Ethernet adapter
-Class Comtrend | embedded || specialized
-Class AcBel | embedded || specialized
+Class Comtrend | embedded || bridge
+Class AcBel | embedded || bridge
 SEQ(SP=0-16%GCD=9C4|1388|1D4C|2710|30D4%ISR=0-67%TI=I%TS=U)
 OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
 WIN(W1=7805%W2=7805%W3=7805%W4=7805%W5=7805%W6=7805)
@@ -6810,7 +6810,7 @@ IE(R=N)
 
 # Comtrend CT-800 SIP gateway
 Fingerprint Comtrend CT-800 VoIP gateway
-Class Comtrend | embedded || VoIP gateway
+Class Comtrend | embedded || VoIP adapter
 SEQ(SP=14-1E%GCD=7A00|F400|16E00|1E800|26200%ISR=91-9B%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=43E0%W2=4110%W3=423C%W4=4074%W5=4180%W6=403D)
@@ -7247,7 +7247,7 @@ IE(DFI=S%T=19-23%TG=20%CD=S)
 
 # D-Link VoIP Gateway DVG-4022S
 Fingerprint D-Link DVG-4022S VoIP gateway
-Class D-Link | embedded || VoIP gateway
+Class D-Link | embedded || VoIP adapter
 SEQ(SP=8F-99%GCD=1-6%ISR=92-9C%TI=I%II=RI%SS=O%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -8371,7 +8371,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Eicon Shiva series VPN gateway. Running an embedded Linux-based operating system.
 Fingerprint Eicon Shiva VPN gateway
-Class Eicon | embedded || encryption accelerator
+Class Eicon | embedded || proxy server
 SEQ(SP=101-10B%GCD=1-6%ISR=105-10F%TI=I%II=RI%SS=S%TS=U)
 OPS(O1=WAN%O2=M578%O3=%O4=%O5=M218%O6=M109)
 WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
@@ -10486,7 +10486,7 @@ IE(DFI=N%T=FA-104%TG=FF%CD=Z)
 
 # Fujitsu Siemens, integrated Remote Control Board on a FSC RX300.
 Fingerprint Fujitsu Siemens PRIMERGY RX300 S4 server
-Class Fujitsu Siemens | embedded || web server
+Class Fujitsu Siemens | embedded || general purpose
 SEQ(SP=C-16%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B%ISR=97-A1%TI=I%II=I%SS=S%TS=U)
 OPS(O1=MF8%O2=MF8%O3=MF8%O4=MF8%O5=MF8%O6=MF8)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -10666,7 +10666,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Grandstream Handytone HT-488
 Fingerprint Grandstream HandyTone HT-488 analog VoIP adapter
-Class Grandstream | embedded || VoIP gateway
+Class Grandstream | embedded || VoIP adapter
 SEQ(SP=0-5%GCD=0%ISR=0-5%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5A6%O2=M5A6%O3=M5A6%O4=M5A6%O5=M5A6%O6=M5A6)
 WIN(W1=5A6%W2=578%W3=280%W4=280%W5=218%W6=109)
@@ -15850,7 +15850,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Linksys PAP2T VoIP Router Software Version 5.1.3(LS) Hardware Version 0.1.5
 # LinkSys Phone Adapter with 2 Ports for Voice-Over-IP, Firmware Version: 3.1.15(LS)
 Fingerprint Linksys PAP2T VoIP router
-Class Linksys | embedded || VoIP gateway
+Class Linksys | embedded || VoIP adapter
 SEQ(R=N)
 OPS(R=N)
 WIN(R=N)
@@ -15890,7 +15890,7 @@ IE(DFI=N%T=F5-FF%TG=FF%CD=S)
 # Linksys SPA962 Version 5.2.8
 Fingerprint Linksys SPA942, SPA962, or SPA9000 VoIP phone; SPA3102 VoIP gateway; or Sipura SPA-2100 or SPA-2101 VoIP adapter
 Class Linksys | embedded || VoIP phone
-Class Linksys | embedded || VoIP gateway
+Class Linksys | embedded || VoIP adapter
 Class Sipura | embedded || VoIP adapter
 SEQ(SP=FC-108%GCD=1-6%ISR=104-110%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5A8%O2=M5A8%O3=M5A8%O4=M5A8%O5=M5A8%O6=M5A8)
@@ -28211,7 +28211,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # Mitel 3300 CXI vxworks
 Fingerprint Mitel 3300 CXi VoIP PBX
-Class Mitel | embedded || VoIP gateway
+Class Mitel | embedded || VoIP adapter
 SEQ(SP=92-9C%GCD=1-6%ISR=9A-A4%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=21F0%W2=2088%W3=2258%W4=2134%W5=20C0%W6=209D)
@@ -28963,7 +28963,7 @@ IE(DFI=S%T=37-41%TG=40%CD=S)
 
 # Netcomm V300 VOIP ATA running software version A007-S9210NGT-C00_00
 Fingerprint Netcomm V300 VoIP gateway
-Class Netcomm | embedded || VoIP gateway
+Class Netcomm | embedded || VoIP adapter
 SEQ(SP=14-1E%GCD=7A00|F400|16E00|1E800|26200%ISR=91-9B%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M550NW0NNT11%O2=M550NW0NNT11%O3=M550NW0NNT11%O4=M550NW0NNT11%O5=M550NW0NNT11%O6=M550NNT11)
 WIN(W1=43E0%W2=4110%W3=423C%W4=4074%W5=4180%W6=403D)
@@ -30033,7 +30033,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Occam ONT ON2342 Firmware version: 1.1.5 Configuration version: 1.6.3 Build String: Sun Aug 20
 Fingerprint Occam ONT ON2342 Voice/Video over IP box
-Class Occam | embedded || VoIP gateway
+Class Occam | embedded || VoIP adapter
 SEQ(SP=B4-BE%GCD=1-6%ISR=CB-D5%TI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
@@ -30986,7 +30986,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Patton/Inalp (www.patton.com) Smartnode 4960 VoIP Gateway. OS is Smartware 4.2.
 Fingerprint Patton SmartNode 4960 VoIP gateway (SmartWare 4.2)
-Class Patton | SmartWare | 4.X | VoIP gateway
+Class Patton | SmartWare | 4.X | VoIP adapter
 SEQ(SP=0-1D%GCD=0|8000|10000|18000|20000|28000%ISR=0-FB%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -31457,7 +31457,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=S)
 
 # Portech GSM VoIP GSM:900/1800MHz v6.0 gateway
 Fingerprint PORTech GSM VoIP gateway
-Class PORTech | embedded || VoIP gateway
+Class PORTech | embedded || VoIP adapter
 SEQ(SP=0-16%GCD=FA|1F4|2EE|3E8|4E2|61A8|C350|124F8|186A0|1E848%ISR=8A-94%TI=I%II=RI%SS=O|S%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M5B4%O5=M218%O6=M109)
 WIN(W1=3180%W2=3180%W3=3180%W4=3180%W5=3180%W6=3180)
@@ -31474,7 +31474,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # 4-port GSM-SIP gateway PORTech MV-374
 Fingerprint PORTech MV-374 GSM-SIP VoIP gateway
-Class PORTech | embedded || VoIP gateway
+Class PORTech | embedded || VoIP adapter
 SEQ(SP=0-5%GCD=61A8|C350|124F8|186A0|1E848%ISR=8A-94%TI=I%II=RI%SS=O%TS=U)
 OPS(O1=M5B4|WANM5B4T10S%O2=M578|M578W0ST10L%O3=M280|T10NNW5NM280%O4=M5B4|ST10WAL%O5=M218|M218ST10WAL%O6=M109ST10)
 WIN(W1=0|3180%W2=0|3180%W3=0|3180%W4=0|3180%W5=0|3180%W6=0)
@@ -32058,7 +32058,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # Samsung Office Serve 7200 Phone System
 Fingerprint Samsung OfficeServ 7200 VoIP gateway
-Class Samsung | embedded || VoIP gateway
+Class Samsung | embedded || VoIP adapter
 SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=3354%W2=3354%W3=3354%W4=3354%W5=3354%W6=3354)
@@ -32732,7 +32732,7 @@ IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
 # ShoteTel ShoteGear T1
 Fingerprint ShoreTel ShoreGear-T1 VoIP switch
-Class ShoreTel | embedded || VoIP gateway
+Class ShoreTel | embedded || VoIP adapter
 SEQ(R=N)
 OPS(R=N)
 WIN(R=N)
@@ -35118,7 +35118,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Hardware Platform  : Vega 400  H323 Firmware Rev 08.00 for H/W Type 10
 Fingerprint Vegastream Vega 400 VoIP Gateway
-Class Vegastream | embedded || VoIP gateway
+Class Vegastream | embedded || VoIP adapter
 SEQ(SP=E7-103%GCD=1-6%ISR=106-110%TI=I|RD%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=3E80%W2=3E80%W3=3E80%W4=3E80%W5=3E80%W6=3E80)
diff --git a/nmap-service-probes b/nmap-service-probes
index a9a65c329..995320f7f 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -103,8 +103,8 @@ match scmbug m|^SCMBUG-SERVER RELEASE_([-\w_.]+) \d+\n| p/Scmbug bugtracker/ v/$
 match bru m|^0x[0-9a-fA-F]{32}L| p/Tolis BRU/ i/Backup and Restore Utility/
 
 # Bruker AXS X-ray machines (how cool is that!?!?) (Brandon)
-match bruker-axs m|^\[ANGLESTATUS.*\[XYZSTATUS.*\[ZOOMSTATUS.*\[INSTRUMENTSTATUS.*XRAYSON=1|s p/Bruker AXS X-ray controller status/ i/X-rays: On/ d/X-ray machine/
-match bruker-axs m|^\[ANGLESTATUS.*\[XYZSTATUS.*\[ZOOMSTATUS.*\[INSTRUMENTSTATUS.*XRAYSON=0|s p/Bruker AXS X-ray controller status/ i/X-rays: Off/ d/X-ray machine/
+match bruker-axs m|^\[ANGLESTATUS.*\[XYZSTATUS.*\[ZOOMSTATUS.*\[INSTRUMENTSTATUS.*XRAYSON=1|s p/Bruker AXS X-ray controller status/ i/X-rays: On/ d/specialized/
+match bruker-axs m|^\[ANGLESTATUS.*\[XYZSTATUS.*\[ZOOMSTATUS.*\[INSTRUMENTSTATUS.*XRAYSON=0|s p/Bruker AXS X-ray controller status/ i/X-rays: Off/ d/specialized/
 
 match buildservice m|^200 HELLO - BuildForge Agent v([\w-_.]+)\n| p/BuildForge Agent/ v/$1/
 match buildservice m|^\$\0\0\0\$\0\0\x000RAR\0 \0\0.\xe2\x02\0\xc4G\x0f\0\0\0\0\0\0\0\0\0\0\0\0\0|s p/Xoreax IncrediBuild/ o/Windows/
@@ -760,7 +760,7 @@ match fyre m|^220 Fyre rendering server ready\n| p/Fyre rendering cluster node/
 match galaxy m|^\0\0\0\t\0\0\0\x80\0\0\0\0\0\0\0\0\0\0\x042\0\0\0\x01\0\0\t_\0\0\0h| p/Galaxy Client Event Manager/ o/Windows/
 match gnats m|^200 ([-.\w]+) GNATS server (\d[-.\w]+) ready\.\r\n| p/GNATS bugtracking system/ h/$1/ v/$2/
 
-match ganglia m|^<\?xml version=\"1\.0\".*<!DOCTYPE GANGLIA_XML.*<GANGLIA_XML VERSION=\"([^\"]+)\" SOURCE=\"([^\"]+)\">.*<CLUSTER NAME=\"([^\"]+)\" LOCALTIME=\"\d+\" OWNER=\"([^\"]+)\"|s p/Ganglia XML Grid monitor/ v/$1/ i/Cluster name: $3; Owner: $4; Source: $2/ d/cluster/
+match ganglia m|^<\?xml version=\"1\.0\".*<!DOCTYPE GANGLIA_XML.*<GANGLIA_XML VERSION=\"([^\"]+)\" SOURCE=\"([^\"]+)\">.*<CLUSTER NAME=\"([^\"]+)\" LOCALTIME=\"\d+\" OWNER=\"([^\"]+)\"|s p/Ganglia XML Grid monitor/ v/$1/ i/Cluster name: $3; Owner: $4; Source: $2/ d/specialized/
 
 # Probably not general enough...
 match gnatbox m|^GBPK\xfb\xf7n\x93W\xaf\x86\x93x@\xa9\x0e\xca\*\x9bS\0| p/GNATBox firewall administration/ d/firewall/
@@ -2159,7 +2159,7 @@ match solproxy m|^The solproxy is used by [\d.]+\n\rThe client is closed!\n\r| p
 # and http://simp.mitre.org/drafts/antp.html
 # for details
 match beep m|^RPY \d \d \. \d \d+\r\nContent-Type: application/beep\+xml\r\n\r\n<greeting><profile uri=\"http://www\.codingmonkeys\.de/BEEP/SubEthaEditHandshake\"| p/SubEthaEdit collaborative text editor/ o/Mac OS X/
-match beep m|^RPY \d \d \. \d \d+\r\nContent-Type: application/beep\+xml\r\n\r\n<greeting.<profile uri=\"http://www\.apple\.com/beep/GSS\"/>.*/beep/xgrid/controller/|s p/Apple Xgrid Controller/ d/cluster/ o/Mac OS X/
+match beep m|^RPY \d \d \. \d \d+\r\nContent-Type: application/beep\+xml\r\n\r\n<greeting.<profile uri=\"http://www\.apple\.com/beep/GSS\"/>.*/beep/xgrid/controller/|s p/Apple Xgrid Controller/ d/specialized/ o/Mac OS X/
 softmatch beep m|^RPY \d \d \. \d \d+\r\nContent-Type: application/beep\+xml\r\n|
 
 match kvm m|^\0\0\0\x0bSynergy\0\x01\0| p/Synergy KVM/
@@ -3174,7 +3174,7 @@ match paromed m|^PCS-[\w-_.]+,V([\w-_.]+),OK\nERROR:102: ENERROR:102: EN| p/Paro
 # torque, Tera-scale Open-source Resource and QUEue manager (PBS)
 # http://supercluster.org/torque
 # maui, http://supercluster.org/maui
-match pbs-maui m|^\+2\+15\+15056\+\d+\+\d+| p|PBS/Maui Roll| i/Rocks Cluster/ d/cluster/
+match pbs-maui m|^\+2\+15\+15056\+\d+\+\d+| p|PBS/Maui Roll| i/Rocks Cluster/ d/specialized/
 
 match peercast m|^OK2\r\nicy-caps:\d+\r\n\r\nOK\r\n$| p/Peercast/
 # Mercury/32 3.32 PH Server module on Windows XP
@@ -4301,7 +4301,7 @@ match http m|^HTTP/1\.0 \d\d\d .*<title>mikrotik routeros > administration</titl
 match http m|^HTTP/1\.0 \d\d\d .*<title>mikrotik routeros > administration</title>|s p/MikroTik router http config/ d/router/
 match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: thttpd-alphanetworks/([\d.]+)\r\nContent-Type: text/html\r\nDate: .*\r\nLast-Modified: .*\r\nAccept-Ranges: bytes\r\nConnection: close\r\nWWW-Authenticate: Basic realm=\"Broadband Router\"\r\n\r\n<HTML><HEAD><TITLE>401 Unauthorized</TITLE></HEAD><BODY onLoad=javascript:document\.forms\[0\]\.submit\(\);>| p/FiberLine router http config/ i/thttpd-alphanetworks $1/ d/router/
 match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: RMC Webserver ([\d.]+)\r\n.*<title>Remote Access Controller</title>|s p/Dell Remote Access Controller http interface/ v/$1/ d/remote management/
-match http m|^HTTP/1\.0 401 Unauthorized\r\nWWW-Authenticate: Basic realm=\"PROJECTOR\" \r\nContent-Type: text/html\r\n\r\n<HTML><BODY><H2>HTTP Error 401 - Unauthorized</H2><HR></BODY></HTML>| p/Panasonic Video Projector http config/ d/projector/
+match http m|^HTTP/1\.0 401 Unauthorized\r\nWWW-Authenticate: Basic realm=\"PROJECTOR\" \r\nContent-Type: text/html\r\n\r\n<HTML><BODY><H2>HTTP Error 401 - Unauthorized</H2><HR></BODY></HTML>| p/Panasonic Video Projector http config/ d/media device/
 match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: Footprint ([\d.]+)/FPMCP\r\n| p/Sandpiper Footprint http load balancer/ v/$1/
 match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: LogMeIn Web Gateway\r\n| p/LogMeIn remote access web gateway/ o/Windows/
 match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: ArGoSoft Mail Server Freeware, Version [\d.]+ \(([\d.]+)\)\r\n| p/ArGoSoft Mail Server Freeware httpd/ v/$1/ o/Windows/
@@ -4655,7 +4655,7 @@ match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: GoAhead-Webs\r\nDate: .*\r\nWWW-Aut
 match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: Micro-Web\r\nContent-type: text/html\r\n\r\n<html>\r\n<head>\r\n<P><TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=\"100%\">\n<TR><TD WIDTH=\"100%\" ALIGN=CENTER>\n<APPLET CODE=\"Login\.class\" WIDTH=545 HEIGHT=418\nALT=\"\[ Login applet is not available \]\">\n| p/Overland Storage Neo2000 http config/ i/Micro-Web httpd/ d/storage-misc/
 match http m|^HTTP/1\.1 200\r\nContent-type: text/html\r\nConnection: close\r\nCONTENT-LENGTH: \d+\r\n\r\n<html>\r\n <head>\r\n  <title>1761-NET-ENI</title>\r\n| p/Allen Bradley 1761-NET-ENI http config/
 match http m|^HTTP/1\.0 200 OK    \r\nServer: A-B WWW/([\d.]+)\r\n.*<img src=\"/images/rockcolor\.gif|s p/Rockwell Automation Ethernet Processor http config/ i/A-B WWW httpd $1/
-match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: NetPort Software ([\d.]+)\r\nDate: .*\r\nContent-type: text/html\r\n\r\n<html>\r\n<head>\r\n<meta http-equiv=\"content-type\" content=\"text/html;charset=Shift_JIS\">\r\n<title>NEC Projector LAN Control</title>\r\n| p/NEC Projector http config/ d/projector/
+match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: NetPort Software ([\d.]+)\r\nDate: .*\r\nContent-type: text/html\r\n\r\n<html>\r\n<head>\r\n<meta http-equiv=\"content-type\" content=\"text/html;charset=Shift_JIS\">\r\n<title>NEC Projector LAN Control</title>\r\n| p/NEC Projector http config/ d/media device/
 match http m|^HTTP/1\.0 200 ;OK\r\nServer: UPS_Server/([\d.]+)\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n<html>\n<head>\n<title>UPS Properties</title>\n| p/MGE UPS httpd/ v/$1/ d/power-device/
 match http m|^HTTP/1\.1 \d\d\d .*\nContent-Length: \d+\nPragma: no-cache\nExpires: 0\nConnection: close\n\n<HTML><HEAD><TITLE>Bridgit Conferencing Server</TITLE>| p/Bridgit Conferencing httpd/ o/Windows/
 match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: Web Server\r\n.*\n<title>Cisco Systems, Inc\. VPN 3000 Concentrator \[vpn-conc-3030\]</title>\n|s p/Cisco VPN 3000 Concentrator http config/ d/security-misc/
@@ -5160,7 +5160,7 @@ match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: lighttpd|si p/lighttpd/
 match http m|^HTTP/1\.1 401 Unauthorized\r\nServer: micro_httpd\r\nCache-Control: no-cache\r\nDate: .*\r\nWWW-Authenticate: Basic realm=\"U\.S\. Robotics ADSL Router\"\r\n| p/US Robotics USR9107A ADSL http config/ d/broadband router/ i/micro_httpd/
 match http m|^HTTP/1\.0 200 Ok\r\nServer: httpd\r\nDate: .*<SCRIPT language=Javascript src=\"language_us\.js\"></SCRIPT>\n<SCRIPT>assign_var\(\);</SCRIPT>\n<SCRIPT language=JavaScript src=\"showMenu\.js\"></SCRIPT>\n<SCRIPT>\n\tvar helpItem \t='indexa';|s p/Belkin N1 F5D8231-4 WAP http config/ d/WAP/
 match http m|^<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4\.01 Transitional//EN\" \"http://www\.w3\.org/TR/1999/REC-html401-19991224/loose\.dtd\">\n<HTML>\n<HEAD>\n<TITLE>Mac OS X Personal Web Sharing</TITLE>.*<H1>Your website here\.</H1>|s p/REALbasic 2008 example httpd/
-match http m|^HTTP/1\.1 200\r\n.*<TITLE>ProjectorView Control System</TITLE>.*CODE=com\.mitsubishi\.x500u\.X500UApplet\.class\r\n|s p/Mitsubishi Projector XD1000 http config/ d/projector/
+match http m|^HTTP/1\.1 200\r\n.*<TITLE>ProjectorView Control System</TITLE>.*CODE=com\.mitsubishi\.x500u\.X500UApplet\.class\r\n|s p/Mitsubishi Projector XD1000 http config/ d/media device/
 match http m|^HTTP/1\.1 401 Unauthorized\r\nServer: micro_httpd\r\nCache-Control: no-cache\r\nDate: .*\r\nWWW-Authenticate: Basic realm=\"Wireless Router\"\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<HTML><HEAD><TITLE>401 Unauthorized</TITLE></HEAD>\n<BODY BGCOLOR=\"#cc9999\"><H4>401 Unauthorized</H4>\nAuthorization required\.\n| p/Asus wl-600g WAP http config/ d/WAP/
 match http m|^HTTP/1\.0 301 Moved Permanently\r\nCache-Control: no-cache\r\nConnection: close\r\nPragma: no-cache\r\nLocation: /TopAccess/default\.htm\r\nServer: TOSHIBA TEC CORPORATION\r\n| p/Toshiba Tec printer http config/ d/printer/
 match http m|^HTTP/1\.0 303 See Other\r\nLocation: http://[\w-_.]+:8080\r\n\0 .*\rContent-Length: 0\r\n\r\n| p|Toshiba e-STUDIO 233 copier/printer/fax http config| d/printer/
@@ -5333,7 +5333,7 @@ match http-proxy m|^HTTP/1\.0 302 Moved\r\nDate: .*\r\nServer: DeleGate/([\d.]+)
 match http-proxy m|^HTTP/1\.0 302 Moved\r\nDate: .*\r\nServer: DeleGate| p/DeleGate proxy/
 match http-proxy m|^HTTP/1\.0 200 OK\r\nProxy-agent: Netscape-Proxy/([\d.]+)\r\n| p/Netscape-proxy/ v/$1/
 match http-proxy m|^HTTP/1\.0 504 Gateway Timeout\r\nContent-Type: text/html\r\nPragma: no-cache\r\n\r\n<H4><font COLOR=\"#FF0000\">Error parsing http request : </font></H2><p><pre>GET / / HTTP/1\.0\r\n\r\n</pre>| p/WinProxy http proxy/ o/Windows/
-match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nDate: .*\r\nContent-Length: \d+\r\nContent-Type: text/html\r\nServer: NetCache appliance \(NetApp/([\d.]+)\)\r\n\r\n| p/Network Appliance NetCache http proxy/ v/$1/ d/firewall/
+match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nDate: .*\r\nContent-Length: \d+\r\nContent-Type: text/html\r\nServer: NetCache appliance \(NetApp/([\d.]+)\)\r\n\r\n| p/Network Appliance NetCache http proxy/ v/$1/ d/proxy server/
 match http-proxy m|^HTTP/1\.0  500 \r\nProxy-agent: MultiCertify PROXY/([\d.]+)\r\n| p/MultiCertify http proxy/ v/$1/ o/Windows/
 match http-proxy m|^HTTP/1\.1 \d\d\d .*\r\nDate: .*\r\nServer: HTTP::Proxy/([\d.]+)\r\n| p/Perl HTTP::Proxy/ v/$1/
 match http-proxy m|^HTTP/1\.1 407 Proxy Authentication Required\r\nProxy-Authenticate: NTLM\r\nProxy-Authenticate: BASIC realm=\"DOMBUD\"\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n| p/CacheFlow http proxy/ o/CacheOS/
@@ -5350,12 +5350,12 @@ match http-proxy m|^HTTP/1\.1 403 Forbidden\r\nServer: Eplicator/([\d.]+)\r\n| p
 match http-proxy m|^AdsGone Blocked HTML Ad$| p/AdsGone http proxy/ o/Windows/
 match http-proxy m|^<font face=verdana size=1>AdsGone (\d+)  Blocked HTML Ad</font>$| p/AdsGone $1 http proxy/ o/Windows/
 match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nDate: .*\r\nContent-Type: text/html\r\nPragma: no-cache\r\n\r\n<html>\n<head>\n<title>Proxy\+ WWW Admin interface</title>\n\n| p/Fortech Proxy+ http admin/ o/Windows/
-match http-proxy m|^HTTP/1\.1 \d\d\d .*\r\nCache-Control: no-cache\r\nPragma: no-cache\r\nContent-Type: text/html.*\r\nProxy-Connection: close\r\nConnection: close\r\nContent-Length: \d+\r\n\r\n<HTML><HEAD>\n<TITLE>Access Denied</TITLE>\n</HEAD>.*\n<big>Access Denied \(policy_denied\)</big>\n|s p/BlueCoat SG-400 http proxy/
+match http-proxy m|^HTTP/1\.1 \d\d\d .*\r\nCache-Control: no-cache\r\nPragma: no-cache\r\nContent-Type: text/html.*\r\nProxy-Connection: close\r\nConnection: close\r\nContent-Length: \d+\r\n\r\n<HTML><HEAD>\n<TITLE>Access Denied</TITLE>\n</HEAD>.*\n<big>Access Denied \(policy_denied\)</big>\n|s p/BlueCoat SG-400 http proxy/ d/proxy server/
 match http-proxy m|^HTTP/1\.1 \d\d\d .*\r\nCache-Control: no-cache\r\nPragma: no-cache\r\nContent-Type: text/html.*\r\nProxy-Connection: close\r\nConnection: close\r\nContent-Length: \d+\r\n\r\n<HTML><HEAD>\n<TITLE>Request Error</TITLE>\n</HEAD>.*\n<big>Request Error \(invalid_request\)</big>\n|s p/BlueCoat http proxy/
-match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nServer: BlueCoat-Security-Appliance\r\n|s p/BlueCoat http proxy/
-match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nProxy-agent: BlueCoat-WinProxy\r\n| p/BlueCoat WinProxy http proxy/ o/Windows/
+match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nServer: BlueCoat-Security-Appliance\r\n|s p/BlueCoat http proxy/ d/proxy server/
+match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nProxy-agent: BlueCoat-WinProxy\r\n| p/BlueCoat WinProxy http proxy/ o/Windows/ d/proxy server/
 match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nServer: Sawmill/([-\w_.]+)\r\n|s p/BlueCoat Sawmill http proxy config/ v/$1/
-match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nProxy-agent: BlueCoat-ProxyAV\r\n| p/BlueCoat ProxyAV appliance http proxy/ d/security-misc/
+match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nProxy-agent: BlueCoat-ProxyAV\r\n| p/BlueCoat ProxyAV appliance http proxy/ d/proxy server/
 match http-proxy m|^HTTP/1\.0 200 Connection established\r\nPragma: no-cach\r\nContent-Type: text/html; charset=windows-1251\r\n\r\n$| p/UserGate http proxy/ o/Windows/
 match http-proxy m|^HTTP/1\.1 \d\d\d .*\r\nServer: Simple, Secure Web Server ([\d.]+)\r\n|s p/Symantec firewall http proxy/ i/Simple, Secure Web Server $1/ d/firewall/
 match http-proxy m|^HTTP/1\.0 \d\d\d .*\r\nContent-Length: \d+\r\n.*<B>KEN! Proxy</B>|s p/AVM KEN! http proxy/
@@ -5416,8 +5416,8 @@ match http-proxy m|^\njava\.net\.UnknownHostException: /\r\n\tat java\.net\.Plai
 match http-proxy m|^HTTP/1\.1 403 Bad Protocol\r\n.*<H1>I2P ERROR: NON-HTTP PROTOCOL</H1>The request uses a bad protocol\. The I2P HTTP Proxy supports http:// requests ONLY\. Other protocols such as https:// and ftp:// are not allowed\.<BR>|s p/I2P http proxy/
 match http-proxy m|^HTTP/1\.0 502 Bad Gateway\r\nProxy-Connection: close\r\nContent-type: text/html; charset=us-ascii\r\n\r\n<html><head><title>502 Bad Gateway</title></head>\r\n<body><h2>502 Bad Gateway</h2><h3>Host Not Found or connection failed</h3></body></html>\r\n| p/3proxy http proxy/
 match http-proxy m|^HTTP/1\.0 407 Proxy Authentication Required\r\nProxy-Authenticate: NTLM\r\nProxy-Authenticate: basic realm=\"proxy\"\r\nProxy-Connection: close\r\n.*<h2>407 Proxy Authentication Required</h2><h3>Access to requested resource disallowed by administrator or you need valid username/password to use this resource</h3>|s p/3proxy http proxy/ i|authentication required|
-match http-proxy m|^HTTP/1\.0 404 Object not found\r\n.*<title>MIMEsweeper for Web :: ACCESS DENIED</title>|s p/Clearswift MIMEsweeper for web http proxy/ d/security-misc/
-match http-proxy m|^HTTP/1\.1 200 .*<title>Web Filter Block Override</title>.*/XX/YY/ZZ/logo_fguard_wf\.gif|s p/Fortinet FortiGuard http proxy/ d/security-misc/
+match http-proxy m|^HTTP/1\.0 404 Object not found\r\n.*<title>MIMEsweeper for Web :: ACCESS DENIED</title>|s p/Clearswift MIMEsweeper for web http proxy/ d/proxy server/
+match http-proxy m|^HTTP/1\.1 200 .*<title>Web Filter Block Override</title>.*/XX/YY/ZZ/logo_fguard_wf\.gif|s p/Fortinet FortiGuard http proxy/ d/firewall/
 match http-proxy m|^HTTP/1\.1 400 Bad Request\r\nServer: ziproxy\r\n.*\(ziproxy/([\w-_.]+)\)</ADDRESS>|s p/ziproxy http proxy/ v/$1/
 match http-proxy m|^HTTP/1\.1 400 Bad Request\r\nServer: ziproxy\r\n| p/ziproxy http proxy/
 
@@ -5803,7 +5803,7 @@ match http m|^HTTP/1\.0 302 \r\nLocation: ,\r\n\r\n$| p/BlackBox LWU0200-POE-M e
 match http m|^HTTP/1\.0 400 Bad Request \r\nContent-Type: text/plain\r\nContent-Length: \d+\r\n\r\n400 Bad Request Cannot parse request\r\n| p/GotoMeeting httpd/
 
 match http-proxy m|^HTTP/1\.1 503 Service Unavailable\r\ndate: .*\r\nconnection: close\r\n\r\n<html><body><pre><h1>Service unavailable</h1></pre></body></html>\n| p/HTTP Replicator proxy/
-match http-proxy m|^HTTP/1\.1 400 Bad Request\r\n.*This is a WebSEAL error message template file\.|s p/IBM WebSEAL reverse http proxy/ d/security-misc/
+match http-proxy m|^HTTP/1\.1 400 Bad Request\r\n.*This is a WebSEAL error message template file\.|s p/IBM WebSEAL reverse http proxy/ d/proxy server/
 
 match policy m|^action=defer_if_permit Policy Rejection: Invalid data\n\n$| p/Postfix mail policyd/