recog 2.3.15 → 2.3.20

data/xml/smtp_banners.xml

@@ -77,6 +77,7 @@
     <param pos="0" name="service.family" value="Mail Server"/>
     <param pos="0" name="service.product" value="Mail Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^^(?:(\S+) +)?ArGoSoft Mail Server Freeware, Version [^ ]+ \(([^ ]+\.[^ ]+\.[^ ]+\.[^ ]+)\) *$">
@@ -91,6 +92,7 @@
     <param pos="0" name="service.family" value="Mail Server"/>
     <param pos="0" name="service.product" value="Mail Server"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 
@@ -108,6 +110,7 @@
     <param pos="0" name="service.product" value="Mail Server"/>
     <param pos="1" name="host.name"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^([^ ]+) +AppleShare IP Mail Server ([^ ]+\.[\d.]+) SMTP Server Ready *$">
@@ -330,17 +333,20 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^ESMTP Exim$">
-    <description>Exim - without version string or hostname</description>
+  <fingerprint pattern="^ESMTP Exim ?((?:\w\w\w, \d+ \w\w\w \d\d\d\d [\d:]+ [-+]\d{3,4})?)$">
+    <description>Exim - without version string or hostname - timestamp optional</description>
     <example>ESMTP Exim</example>
+    <example system.time="Thu, 29 Apr 2021 06:46:16 +0200">ESMTP Exim Thu, 29 Apr 2021 06:46:16 +0200</example>
     <param pos="0" name="service.vendor" value="exim"/>
     <param pos="0" name="service.family" value="exim"/>
     <param pos="0" name="service.product" value="exim"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:exim:exim:-"/>
+    <param pos="1" name="system.time"/>
   </fingerprint>
 
-  <fingerprint pattern="^ ?([^, ]+)(?:,)? ESMTP \(?(?i:Exim) +(\d+\.[\d_.bRC-]+)\)?(?: +#\d)? ?.?((?:\w\w\w, \d+ \w\w\w \d\d\d\d [\d:]+ [-+]\d\d\d\d)?) *(?:We do not authorize the use of this system to transport unsolicited, and\/or bulk e-mail.)?$">
+  <fingerprint pattern="^ ?([^, ]+)(?:,)? +ESMTP \(?(?i:Exim) +(\d+\.[\d_.bdRC-]+)\)?(?: +#\d+)? ?.?((?:\w\w\w, \d+ \w\w\w \d\d\d\d [\d:]+ [-+]\d{3,4})?) *(?:We do not authorize the use of this system to transport unsolicited, and\/or bulk e-mail.)?$">
     <description>Exim - with version string and optional timestamp</description>
+    <example service.version="4.91" host.name="foo.bar">foo.bar  ESMTP Exim 4.91 Thu, 29 Apr 2021 05:41:36 +400</example>
     <example service.version="4.89" host.name="foo.bar">foo.bar ESMTP Exim 4.89 "</example>
     <example service.version="4.83" host.name="foo.bar">foo.bar, ESMTP EXIM 4.83</example>
     <example service.version="4.84_2" host.name="foo.bar">foo.bar ESMTP Exim 4.84_2 </example>
@@ -349,7 +355,7 @@
     <example service.version="4.89-122312">foo.bar ESMTP Exim 4.89-122312 Thu, 16 Nov 2017 10:33:38 +0200 </example>
     <example service.version="4.87">foo.bar ESMTP (Exim 4.87) Thu, 30 Nov 2017 03:25:58 -0800 </example>
     <example service.version="4.80" system.time="Thu, 16 Nov 2017 01:04:30 -0800">foo.bar ESMTP Exim 4.80 Thu, 16 Nov 2017 01:04:30 -0800 </example>
-    <example service.version="3.12" system.time="Wed, 31 Jan 2001 15:47:23 +1100">foo.bar ESMTP Exim 3.12 #1 Wed, 31 Jan 2001 15:47:23 +1100 </example>
+    <example service.version="4.92.2" system.time="Thu, 29 Apr 2021 07:43:39 +0200">foo.bar ESMTP Exim 4.92.2 #89 Thu, 29 Apr 2021 07:43:39 +0200 </example>
     <example service.version="4.89" host.name="foo.bar"> foo.bar ESMTP Exim 4.89 #1 Thu, 16 Nov 2017 04:55:31 -0500 We do not authorize the use of this system to transport unsolicited, and/or bulk e-mail.</example>
     <param pos="0" name="service.vendor" value="exim"/>
     <param pos="0" name="service.family" value="exim"/>
@@ -429,6 +435,16 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
+  <fingerprint pattern="^([\w.-]+) ESMTP \([a-z0-9]{32}\)$">
+    <description>Barracuda Email Security Gateway - physical or virtual appliance</description>
+    <example host.name="barracuda.foo.bar">barracuda.foo.bar ESMTP (0a8d40ef45300cc1bd0f16ced5c9e6f1)</example>
+    <param pos="0" name="service.vendor" value="Barracuda"/>
+    <param pos="0" name="service.product" value="Email Security Gateway"/>
+    <param pos="0" name="hw.vendor" value="Barracuda"/>
+    <param pos="0" name="hw.product" value="Email Security Gateway"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
   <fingerprint pattern="^([^ ]+) FTGate server ready .*$">
     <description>FTGate mail server, runs on Windows 9x/NT/2k (http://www.ftgate.com)</description>
     <example host.name="foo.bar">foo.bar FTGate server ready -attitude [C.o.r.E]</example>
@@ -821,6 +837,7 @@
     <param pos="0" name="service.family" value="Lotus Domino"/>
     <param pos="0" name="service.product" value="Lotus Domino"/>
     <param pos="0" name="service.version" value="4"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:4"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 
@@ -872,6 +889,7 @@
     <param pos="0" name="service.vendor" value="Lotus"/>
     <param pos="0" name="service.family" value="Lotus Domino"/>
     <param pos="0" name="service.product" value="Lotus Domino"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
     <param pos="1" name="host.name"/>
     <param pos="2" name="notes.build.version"/>
     <param pos="3" name="system.time"/>
@@ -883,6 +901,7 @@
     <param pos="0" name="service.vendor" value="Lotus"/>
     <param pos="0" name="service.family" value="Lotus Domino"/>
     <param pos="0" name="service.product" value="Lotus Domino"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
     <param pos="0" name="system.time.format" value="EEE, d MMM yyyy HH:mm:ss Z"/>
     <param pos="1" name="host.name"/>
     <param pos="2" name="system.time"/>
@@ -1322,6 +1341,25 @@
     <param pos="4" name="system.time"/>
   </fingerprint>
 
+  <fingerprint pattern="^([^ ]+) ESMTP Sendmail ([^/]+)/([^/]+)/Debian-\d\+deb9u1; (.+); .*$">
+    <description>Sendmail - Debian 9.1 (stretch)</description>
+    <example service.version="8.15.2">foo.bar ESMTP Sendmail 8.15.2/8.15.2/Debian-8+deb9u1; Thu, 29 Apr 2021 06:45:02 +0200; (No UCE/UBE) logging access from: xyz.foo.bar(OK)-xyz.foo.bar [10.0.0.1]</example>
+    <param pos="0" name="service.vendor" value="Sendmail"/>
+    <param pos="0" name="service.family" value="Sendmail"/>
+    <param pos="0" name="service.product" value="Sendmail"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="9.1"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:9.1"/>
+    <param pos="0" name="system.time.format" value="EEE, d MMM yyyy HH:mm:ss Z"/>
+    <param pos="1" name="host.name"/>
+    <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sendmail:sendmail:{service.version}"/>
+    <param pos="3" name="sendmail.config.version"/>
+    <param pos="4" name="system.time"/>
+  </fingerprint>
+
   <fingerprint pattern="^([^ ]+) ESMTP Sendmail ([^/]+)/([^/]+)/Debian-\d\+lenny\d; (.+); .*$">
     <description>Sendmail - Debian 5.x (lenny)</description>
     <example service.version="8.14.3">foo.bar ESMTP Sendmail 8.14.3/8.14.3/Debian-5+lenny1; Thu, 30 Nov 2017 12:29:40 +0300; (No UCE/UBE) logging access from: xyz.foo.bar(OK)-xyz.foo.bar [10.0.0.1]</example>
@@ -1560,9 +1598,10 @@
     <param pos="0" name="system.time.format" value="EEE, d MMM yyyy HH:mm:ss Z"/>
   </fingerprint>
 
-  <fingerprint pattern="^ESMTP Sendmail +([^/ ]+) */ *([^/ ]+); (\w\w\w, \d+ \w\w\w \d\d\d\d [\d:]+ [-+]\d\d\d\d)$">
+  <fingerprint pattern="^\s?ESMTP Sendmail +([^/ ]+) */ *([^/ ]+); (\w\w\w, \d+ \w\w\w \d\d\d\d [\d:]+ [-+]\d\d\d\d)$">
     <description>Sendmail - with version and date, w/o hostname or platform (semicolon variant)</description>
     <example service.version="8.13.1" sendmail.config.version="8.13.1" system.time="Thu, 30 Nov 2017 01:58:22 -0700">ESMTP Sendmail  8.13.1/8.13.1; Thu, 30 Nov 2017 01:58:22 -0700</example>
+    <example service.version="8.14.7" sendmail.config.version="8.14.7" system.time="Thu, 29 Apr 2021 14:07:54 +0900"> ESMTP Sendmail 8.14.7/8.14.7; Thu, 29 Apr 2021 14:07:54 +0900</example>
     <param pos="0" name="service.vendor" value="Sendmail"/>
     <param pos="0" name="service.family" value="Sendmail"/>
     <param pos="0" name="service.product" value="Sendmail"/>
@@ -1657,7 +1696,8 @@
     <description>Symantec Mail Security for SMTP</description>
     <example host.name="foo.bar">foo.bar ESMTP Symantec Mail Security</example>
     <param pos="0" name="service.vendor" value="Symantec"/>
-    <param pos="0" name="service.product" value="Symantec Mail Security for SMTP"/>
+    <param pos="0" name="service.product" value="Mail Security for SMTP"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:symantec:mail_security_for_smtp:-"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 
@@ -1665,7 +1705,8 @@
     <description>Symantec Mail Gateway</description>
     <example host.name="foo.bar">foo.bar ESMTP Symantec Messaging Gateway</example>
     <param pos="0" name="service.vendor" value="Symantec"/>
-    <param pos="0" name="service.product" value="Symantec Messaging Gateway"/>
+    <param pos="0" name="service.product" value="Messaging Gateway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:symantec:messaging_gateway:-"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 

data/xml/smtp_expn.xml

@@ -78,6 +78,7 @@
     <param pos="0" name="service.vendor" value="Lotus"/>
     <param pos="0" name="service.family" value="Lotus Domino"/>
     <param pos="0" name="service.product" value="Lotus Domino"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
   </fingerprint>
 
   <fingerprint pattern="^550[ -]Unable to find list '.*'\.$">

data/xml/smtp_help.xml

@@ -15,6 +15,7 @@
     <param pos="0" name="service.family" value="Mail Server"/>
     <param pos="0" name="service.product" value="Mail Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^214[ -].*support@argosoft\.com *$">
@@ -23,6 +24,7 @@
     <param pos="0" name="service.vendor" value="ArGoSoft"/>
     <param pos="0" name="service.family" value="Mail Server"/>
     <param pos="0" name="service.product" value="Mail Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^500[ -]Syntax error, command &quot;XXXX&quot; unrecognized$">

data/xml/smtp_vrfy.xml

@@ -86,7 +86,8 @@
     <description>Symantec Mail Security</description>
     <example>504 &lt;foo&gt;: Recipient address rejected: need fully-qualified address</example>
     <param pos="0" name="service.vendor" value="Symantec"/>
-    <param pos="0" name="service.product" value="Symantec Mail Security for SMTP"/>
+    <param pos="0" name="service.product" value="Mail Security for SMTP"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:symantec:mail_security_for_smtp:-"/>
   </fingerprint>
 
   <fingerprint pattern="^252 Unable to VRFY &quot;.*&quot;, but will accept message and attempt delivery *$">
@@ -94,6 +95,7 @@
     <param pos="0" name="service.vendor" value="Lotus"/>
     <param pos="0" name="service.family" value="Lotus Domino"/>
     <param pos="0" name="service.product" value="Lotus Domino"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
   </fingerprint>
 
 </fingerprints>

data/xml/snmp_sysdescr.xml

@@ -932,7 +932,7 @@
     <example>Monarch M09855 FW Ver 6.2 / 7411 Network Adapter FW Ver CAMO-7.60, 802.11b-g WiFi FW Ver</example>
     <example>Monarch M09855 FW Ver 6.2 / 7411 Network Adapter FW Ver CAMO-7.60, 802.11b-g WiFi FW Ver / Verifier</example>
     <param pos="0" name="os.vendor" value="Avery Dennison"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 
@@ -985,7 +985,7 @@
     <example os.product="NPS 550R Printer Server" os.version="4.11">Axis NPS 550R Printer Server V4.11 Mar 1 1994</example>
     <example os.product="NPS 550RPrint server" os.version="5.22">Axis NPS 550RPrint serverV5.22 Oct 07 1996</example>
     <param pos="0" name="os.vendor" value="Axis"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -1001,7 +1001,7 @@
     <example os.product="SG400" os.version="4.1.1.1" os.version.version="22695">Blue Coat SG400, ProxySG Version: SGOS 4.1.1.1, Release id: 22695</example>
     <example os.product="SG8100" os.version="4.3.4.1" os.version.version="52168">Blue Coat SG8100 Series, ProxySG Version: SGOS 4.3.4.1, Release id: 52168</example>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="3" name="os.version.version"/>
@@ -1011,7 +1011,7 @@
     <description>Blue Coat ProxyAV</description>
     <example os.product="AV1200" os.version="3.2.6.1" os.version.version="51482">Blue Coat AV1200 Series, ProxyAV Version: 3.2.6.1, Release id: 51482</example>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="3" name="os.version.version"/>
@@ -1040,6 +1040,8 @@
     <param pos="0" name="os.product" value="Fabric OS"/>
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:brocade:fabric_os:-"/>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
+    <param pos="0" name="hw.device" value="Switch"/>
   </fingerprint>
 
   <fingerprint pattern="^Brocade ((?:\S+ )?SAN Switch) Module for IBM eServer BladeCenter$">
@@ -1050,6 +1052,7 @@
     <param pos="0" name="os.vendor" value="Brocade"/>
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="1" name="os.product"/>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
   </fingerprint>
 
   <fingerprint pattern="^Brocade (?:Communications? Systems, Inc\. )?([^,\(]+)(?: \([^\)]+\))?,(?: Extended route scalability,)? IronWare Version V?(\S+) .*$">
@@ -1079,6 +1082,47 @@
     <param pos="2" name="os.version"/>
   </fingerprint>
 
+  <fingerprint pattern="^Brocade VDX Switch, BR-(\S+), Network Operating System Software Version (\S+)\.$">
+    <description>Brocade VDX Switch</description>
+    <example hw.product="VDX6740" os.version="7.0.2b">Brocade VDX Switch, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
+    <param pos="0" name="os.vendor" value="Brocade"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.family" value="NetworkOS"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
+    <param pos="0" name="hw.family" value="VDX"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+  </fingerprint>
+
+  <fingerprint pattern="^([^,]+), (VDX\S+), Network Operating System Software Version (\S+)\.$">
+    <description>Brocade VDX Switch w/Hostname</description>
+    <example host.name="core02" hw.product="VDX6740T-1G" os.version="7.0.1b">core02, VDX6740T-1G, Network Operating System Software Version 7.0.1b.</example>
+    <param pos="0" name="os.vendor" value="Brocade"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.family" value="NetworkOS"/>
+    <param pos="3" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
+    <param pos="0" name="hw.family" value="VDX"/>
+    <param pos="2" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^([^,]+), BR-(\S+), Network Operating System Software Version (\S+)\.$">
+    <description>Brocade VDX Switch w/Hostname and BR prefix</description>
+    <example host.name="core01" hw.product="VDX6740" os.version="7.0.2b">core01, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
+    <param pos="0" name="os.vendor" value="Brocade"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.family" value="NetworkOS"/>
+    <param pos="3" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Brocade"/>
+    <param pos="0" name="hw.family" value="VDX"/>
+    <param pos="2" name="hw.product"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
   <!--======================================================================
                               BROTHER
    =======================================================================-->
@@ -1320,7 +1364,7 @@
     <description>Canon Camera</description>
     <example>Canon Network Camera VB-C60</example>
     <param pos="0" name="os.vendor" value="Canon"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 
@@ -1345,7 +1389,7 @@
     <description>Castelle FaxPress</description>
     <param pos="0" name="os.vendor" value="Castelle"/>
     <param pos="0" name="os.product" value="FaxPress"/>
-    <param pos="0" name="os.device" value="Fax server"/>
+    <param pos="0" name="os.device" value="Fax Server"/>
   </fingerprint>
 
   <!--======================================================================
@@ -1539,7 +1583,7 @@
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance:{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:{os.version}"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -1554,7 +1598,7 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="760 Series"/>
     <param pos="0" name="os.product" value="761"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
 
@@ -1568,7 +1612,7 @@
     <param pos="0" name="os.product" value="VPN 3000 Concentrator"/>
     <param pos="0" name="os.device" value="VPN"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:vpn_3000_concentrator:{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:vpn_3000_concentrator_series_software:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Cisco )?Network Analysis Module \(WS-[^\)]+\), Version ([^, ]+)[,\s]?">
@@ -1587,6 +1631,11 @@ Copyright (c) 1999-2004 by cisco Systems, Inc.</example>
     <param pos="0" name="os.product" value="NAM"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:network_analysis_module_software:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.product" value="NAM"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:network_analysis_module:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Cisco )?Network Analysis Module \(WS-([^\-]+)-NAM\)$">
@@ -1596,6 +1645,9 @@ Copyright (c) 1999-2004 by cisco Systems, Inc.</example>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.product" value="NAM"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:network_analysis_module_software:-"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -1796,6 +1848,21 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="1" name="os.version"/>
   </fingerprint>
 
+  <!--======================================================================
+                                Cumulus
+   =======================================================================-->
+
+  <fingerprint pattern="^Cumulus Linux (\S+) \(Linux Kernel ([^\)]+)\)">
+    <description>Cumulus Linux</description>
+    <example os.version="3.7.2" os.version.version="4.1.33-1+cl3u17">Cumulus Linux 3.7.2 (Linux Kernel 4.1.33-1+cl3u17)</example>
+    <param pos="0" name="os.vendor" value="Cumulus"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.product" value="Cumulus Linux"/>
+    <param pos="1" name="os.version"/>
+    <param pos="2" name="os.version.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cumulusnetworks:cumulus_linux:{os.version}"/>
+  </fingerprint>
+
   <!--======================================================================
                               DATA DOMAIN
    =======================================================================-->
@@ -1807,6 +1874,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.product" value="DD OS"/>
     <param pos="0" name="os.device" value="Storage"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:{os.version}"/>
   </fingerprint>
 
   <!--======================================================================
@@ -1831,7 +1899,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Datamax Printer</example>
     <param pos="0" name="os.vendor" value="Datamax"/>
     <param pos="0" name="os.device" value="Printer"/>
-    <param pos="0" name="os.product" value="Print server"/>
+    <param pos="0" name="os.product" value="Print Server"/>
   </fingerprint>
 
   <!--======================================================================
@@ -2970,7 +3038,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>HP ETHERNET MULTI-ENVIRONMENT</example>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.family" value="JetDirect"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <fingerprint pattern="^HP ETHERNET MULTI-ENVIRONMENT,ROM (\S+?),JETDIRECT(?: EX)?,(\w+),EEPROM.*$">
@@ -2981,7 +3049,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>HP ETHERNET MULTI-ENVIRONMENT,ROM B.25.01,JETDIRECT,JD118,EEPROM D.27.02,CIDATE 03/23/2004</example>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.family" value="JetDirect"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.version"/>
     <param pos="2" name="os.product"/>
   </fingerprint>
@@ -3014,6 +3082,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.product" value="iLO"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Integrated Lights-Out (\d) \(iLO \d\) for Integrity$">
@@ -3024,6 +3093,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.product" value="iLO"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:{os.version}"/>
   </fingerprint>
 
   <!--======================================================================
@@ -3389,7 +3459,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="Intel"/>
     <param pos="0" name="os.family" value="NetportExpress"/>
     <param pos="0" name="os.product" value="PRO/100"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <!--======================================================================
@@ -3401,7 +3471,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Intermec CX Terminal</example>
     <param pos="0" name="os.vendor" value="Intermec"/>
     <param pos="0" name="os.product" value="CX Data Collection Terminal"/>
-    <param pos="0" name="os.device" value="POS"/>
+    <param pos="0" name="os.device" value="Point of Sale"/>
   </fingerprint>
 
   <fingerprint pattern="^Thermal Label Printer Intermec (\S+)$">
@@ -3848,7 +3918,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.certainty" value="1.0"/>
     <param pos="0" name="os.vendor" value="Lexmark"/>
     <param pos="0" name="os.family" value="MarkNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -3933,7 +4003,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <description>Lexmark Printer - print server variant</description>
     <example>Lexmark C500 PS Print Server</example>
     <param pos="0" name="os.vendor" value="Lexmark"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 
@@ -4740,7 +4810,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>LX Console Manager, s/w version=5.3.9</example>
     <param pos="0" name="os.vendor" value="MRV Communications"/>
     <param pos="0" name="os.product" value="LX"/>
-    <param pos="0" name="os.device" value="Remote access server"/>
+    <param pos="0" name="os.device" value="Remote Access Server"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
 
@@ -4753,7 +4823,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>RASExpress Server Version 5.63</example>
     <param pos="0" name="os.vendor" value="MultiTech"/>
     <param pos="0" name="os.product" value="RASExpress"/>
-    <param pos="0" name="os.device" value="Remote access server"/>
+    <param pos="0" name="os.device" value="Remote Access Server"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
 
@@ -4784,7 +4854,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="NetApp"/>
     <param pos="0" name="os.family" value="Data ONTAP"/>
     <param pos="0" name="os.product" value="Data ONTAP"/>
-    <param pos="0" name="os.device" value="File server"/>
+    <param pos="0" name="os.device" value="NAS"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
   </fingerprint>
@@ -4833,7 +4903,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Netopia R9100 v4.8.2</example>
     <param pos="0" name="os.vendor" value="Netopia"/>
     <param pos="0" name="os.family" value="Netopia"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -4852,6 +4922,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.product" value="NetScaler"/>
     <param pos="1" name="os.version"/>
     <param pos="2" name="os.version.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:{os.version}"/>
   </fingerprint>
 
   <!--======================================================================
@@ -4997,7 +5068,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example os.product="2424">Nortel Application Switch 2424</example>
     <param pos="0" name="os.vendor" value="Nortel"/>
     <param pos="0" name="os.family" value="Application Switch"/>
-    <param pos="0" name="os.device" value="Load balancer"/>
+    <param pos="0" name="os.device" value="Load Balancer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 
@@ -5258,7 +5329,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.family" value="NC Series"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <fingerprint pattern="^Oce (im\d+)$">
@@ -5445,7 +5516,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B720n Rev.7.1b1: (C)2005 OKI DATA CORP</example>
     <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B930 Rev.3.6: (C)2005 OKI DATA CORP</example>
     <param pos="0" name="os.vendor" value="Oki"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 
@@ -5454,7 +5525,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>OKI FastEther8450e Rev.01.08 10/100BASE Ethernet PrintServer: Attached to B430 Rev.C2.00 : Copyright (c) 2008 Oki Data Corporation. All rights reserved.</example>
     <example>OKI FastEther8450e Rev.08.01 10/100BASE Ethernet PrintServer: Attached to C5650 Rev.M1.02 : Copyright (c) 2007 Oki Data Corporation. All rights reserved.</example>
     <param pos="0" name="os.vendor" value="Oki"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -5495,14 +5566,28 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Palo Alto Networks PA-4000 series firewall</example>
     <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
     <param pos="0" name="os.device" value="Firewall"/>
-    <param pos="1" name="os.product"/>
+    <param pos="0" name="os.product" value="PAN-OS"/>
+    <param pos="0" name="os.family" value="PAN-OS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
+    <param pos="0" name="service.vendor" value="Palo Alto Networks"/>
+    <param pos="0" name="service.device" value="Firewall"/>
+    <param pos="0" name="hw.vendor" value="Palo Alto Networks"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="1" name="hw.product"/>
   </fingerprint>
 
   <fingerprint pattern="^Palo Alto Networks Panorama server$">
     <description>Palo Alto Panorama</description>
     <example>Palo Alto Networks Panorama server</example>
     <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
-    <param pos="0" name="os.product" value="Panorama Server"/>
+    <param pos="0" name="os.product" value="PAN-OS"/>
+    <param pos="0" name="os.family" value="PAN-OS"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
+    <param pos="0" name="service.vendor" value="Palo Alto Networks"/>
+    <param pos="0" name="service.product" value="Panorama Server"/>
+    <param pos="0" name="service.device" value="Firewall"/>
+    <param pos="0" name="hw.vendor" value="Palo Alto Networks"/>
   </fingerprint>
 
   <!--======================================================================
@@ -5645,7 +5730,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Rectifier Technologies Pacific WebCSU 169-412 V1.30</example>
     <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
     <param pos="0" name="os.family" value="RTP Power Controller"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -5655,7 +5740,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Rectifier SNMP Server</example>
     <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
     <param pos="0" name="os.family" value="RTP Power Controller"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="0" name="os.product" value="WebCSU"/>
   </fingerprint>
 
@@ -6093,13 +6178,13 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="hw.vendor" value="SonicWall"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.model"/>
     <param pos="3" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
   </fingerprint>
 
-
   <fingerprint pattern="^SonicWALL (\S+).*?\(SonicOS \S+ ((?:\d\.)+\d+-\d+[a-zA-Z]).*\)">
     <description>SonicWall - SonicOS Enhanced variant without hardware model</description>
     <example hw.product="SOHO" os.version="5.9.1.4-4o">SonicWALL SOHO (SonicOS Enhanced 5.9.1.4-4o)</example>
@@ -6107,6 +6192,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="hw.vendor" value="SonicWall"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
@@ -6126,6 +6212,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.product" value="SonicOS"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+    <param pos="0" name="hw.vendor" value="SonicWall"/>
     <param pos="1" name="hw.family"/>
     <param pos="2" name="hw.product"/>
   </fingerprint>
@@ -6905,7 +6992,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>silex PocketPro 100s</example>
     <example>silex PocketPro 100s compatible with an HP JETDIRECT EX</example>
     <param pos="0" name="os.vendor" value="Troy"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="0" name="os.product" value="PocketPro"/>
   </fingerprint>
 
@@ -6923,6 +7010,73 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.device" value="Multifunction Device"/>
   </fingerprint>
 
+  <!--======================================================================
+                              UBIQUITI
+   =======================================================================-->
+
+  <fingerprint pattern="^(UAP-[^\s]+) ([0-9][.a-zA-Z0-9\-]+)$">
+    <description>Ubiquiti Wireless UAP</description>
+    <example hw.product="UAP-AC-Mesh-Pro" hw.version="4.3.20.11298">UAP-AC-Mesh-Pro 4.3.20.11298</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="WAP"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="WAP"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(EdgeSwitch [^,]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)">
+    <description>Ubiquiti EdgeSwitch w/Version and Linux version</description>
+    <example hw.product="EdgeSwitch 48-Port Lite" hw.version="1.8.1.5145168" os.version="3.6.5-1b505fb7">EdgeSwitch 48-Port Lite, 1.8.1.5145168, Linux 3.6.5-1b505fb7, 1.1.0.5102011</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="3" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(USW GigaBit Ethernet Switch), firmware v?([0-9][.a-zA-Z0-9\-]+)$">
+    <description>Ubiquiti GigaBit Ethernet Switch w/Version</description>
+    <example hw.product="USW GigaBit Ethernet Switch" hw.version="5.34.0.12180">USW GigaBit Ethernet Switch, firmware 5.34.0.12180</example>
+    <example hw.product="USW GigaBit Ethernet Switch" hw.version="4.3.20.1129">USW GigaBit Ethernet Switch, firmware v4.3.20.1129</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Switch"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)$">
+    <description>Ubiquiti Switch w/Version and Linux version</description>
+    <example hw.product="USW-8P-60" hw.version="4.3.20.11298" os.version="3.6.5">USW-8P-60, 4.3.20.11298, Linux 3.6.5</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="3" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+)$">
+    <description>Ubiquiti Switch w/Version (no Linux version)</description>
+    <example hw.product="USW-5-Flex" hw.version="4.0.80.10875">USW-5-Flex, 4.0.80.10875</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="Ubiquiti"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Switch"/>
+  </fingerprint>
+
   <!--======================================================================
                               UNISYS
    =======================================================================-->
@@ -6948,15 +7102,30 @@ Copyright (c) 1995-2005 by Cisco Systems
                              VMware
    =======================================================================-->
 
-  <fingerprint pattern="^(VMware ESXi?) (\d\.\d+\.\d+) build-\d+ VMware, Inc\. (\S+)$">
-    <description>VMware ESX/ESXi</description>
-    <example os.product="VMware ESXi" os.version="5.1.0" os.arch="x86_64">VMware ESXi 5.1.0 build-1157734 VMware, Inc. x86_64</example>
-    <example os.product="VMware ESX" os.version="5.0.0" os.arch="x86_64">VMware ESX 5.0.0 build-623860 VMware, Inc. x86_64</example>
+  <fingerprint pattern="^VMware ESXi (\d\.\d+\.\d+) build-\d+ VMware, Inc\. (\S+)$">
+    <description>VMware ESXi</description>
+    <example os.version="5.1.0" os.arch="x86_64">VMware ESXi 5.1.0 build-1157734 VMware, Inc. x86_64</example>
     <param pos="0" name="os.vendor" value="VMware"/>
     <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
-    <param pos="1" name="os.product"/>
-    <param pos="2" name="os.version"/>
-    <param pos="3" name="os.arch"/>
+    <param pos="0" name="os.product" value="VMware ESXi Server"/>
+    <param pos="1" name="os.version"/>
+    <param pos="2" name="os.arch"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esxi:{os.version}"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^VMware ESX (\d\.\d+\.\d+) build-\d+ VMware, Inc\. (\S+)$">
+    <description>VMware ESX</description>
+    <example os.version="5.0.0" os.arch="x86_64">VMware ESX 5.0.0 build-623860 VMware, Inc. x86_64</example>
+    <param pos="0" name="os.vendor" value="VMware"/>
+    <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
+    <param pos="0" name="os.product" value="VMware ESX Server"/>
+    <param pos="1" name="os.version"/>
+    <param pos="2" name="os.arch"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esx:{os.version}"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
   </fingerprint>
 
   <fingerprint pattern="^&quot;vSphere Management Assistant ([\d\.]+)&quot;$">
@@ -7188,7 +7357,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>ZebraNet PrintServer</example>
     <param pos="0" name="os.vendor" value="ZebraNet"/>
     <param pos="0" name="os.product" value="PrintServer"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <!--======================================================================
@@ -7200,7 +7369,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Prestige 645</example>
     <param pos="0" name="os.vendor" value="Zyxel"/>
     <param pos="0" name="os.product" value="Prestige 645"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^Prestige 660HW-61$">
@@ -7232,7 +7401,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Prestige 642R-13</example>
     <param pos="0" name="os.vendor" value="Zyxel"/>
     <param pos="0" name="os.product" value="Prestige 642R-13"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^Prestige 660ME-61$">
@@ -7240,7 +7409,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Prestige 660ME-61</example>
     <param pos="0" name="os.vendor" value="Zyxel"/>
     <param pos="0" name="os.product" value="Prestige 660ME-61"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^Prestige 650R-T3$">
@@ -7248,7 +7417,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>Prestige 650R-T3</example>
     <param pos="0" name="os.vendor" value="Zyxel"/>
     <param pos="0" name="os.product" value="Prestige 650R-T3"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
 </fingerprints>