diff --git a/nmap-os-db b/nmap-os-db
index 67f8979b2..8193ccd43 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -3806,12 +3806,12 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Apple TV Model MC572FD/A Apple TV Software Version: 5.0.1 (4224)
 # Darwin 12.4.0 Darwin Kernel Version 12.4.0: Wed May  1 17:57:12 PDT 2013; root:xnu-2050.24.15~1/RELEASE_X86_64 x86_64
 # Darwin 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) or iOS 5.0.1 - 5.1.1 (Darwin 11.0.0 - 13.2.0)
+Fingerprint Apple OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) or iOS 5.0.1 - 5.1.1 (Darwin 11.0.0 - 13.2.0)
 Class Apple | iOS | 5.X | media device
 CPE cpe:/o:apple:iphone_os:5
-Class Apple | Mac OS X | 10.8.X | general purpose
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8
-Class Apple | Mac OS X | 10.9.X | general purpose
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9
 SEQ(SP=F1-109%GCD=1-6%ISR=FF-111%TI=RD%II=RI%TS=8|A|C)
 OPS(O1=M5B4NW4NNT11SLL%O2=M5B4NW4NNT11SLL%O3=M5B4NW4NNT11%O4=M5B4NW4NNT11SLL%O5=M5B4NW4NNT11SLL%O6=M5B4NNT11SLL)
@@ -4064,12 +4064,12 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # iOS 8.3 on iPad mini
 # Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
 # iOS 9.0.1
-Fingerprint Apple Mac OS X 10.10.3 (Yosemite) or iOS 8.3 - 9.0.1 (Darwin 14.0.0 - 15.0.0)
+Fingerprint Apple OS X 10.10.3 (Yosemite) or iOS 8.3 - 9.0.1 (Darwin 14.0.0 - 15.0.0)
 Class Apple | iOS | 8.X | phone
 CPE cpe:/o:apple:iphone_os:8 auto
 Class Apple | iOS | 9.X | phone
 CPE cpe:/o:apple:iphone_os:9 auto
-Class Apple | Mac OS X | 10.10.X | general purpose
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
 SEQ(SP=FE-10C%GCD=1-6%ISR=109-113%TI=RD%II=RI%TS=A)
 OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%O6=M5B4NNT11SLL)
@@ -4757,8 +4757,8 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # Darwin 14.0.0 Darwin Kernel Version 14.0.0: Fri Sep 19 00:26:44 PDT 2014; root:xnu-2782.1.97~2/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10 (Yosemite) (Darwin 14.0.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10 (Yosemite) (Darwin 14.0.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
 SEQ(SP=FA-10C%GCD=1-6%ISR=101-113%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M5B4NW5NNT11SLL%O2=M578NW5NNT11SLL%O3=M280NW5NNT11%O4=M22CNW5NNT11SLL%O5=M218NW5NNT11SLL%O6=M109NNT11SLL)
@@ -4778,10 +4778,10 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # 14.0.0 Darwin Kernel Version 14.0.0: Fri Sep 19 00:26:44 PDT 2014; root:xnu-2782.1.97~2/RELEASE_X86_64 x86_64
 # Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
 # OS X El Capitan 10.11.0
-Fingerprint Apple Mac OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.0.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.0.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
-Class Apple | Mac OS X | 10.11.X | general purpose
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 SEQ(SP=FD-10B%GCD=1-6%ISR=FB-111%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%O6=M5B4NNT11SLL)
@@ -4801,10 +4801,10 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Darwin 14.0.0 Darwin Kernel Version 14.0.0: Wed Jul 16 00:46:31 PDT 2014; root:xnu-2782.1.43.0.2~2/RELEASE_X86_64 x86_64
 # Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
 # Darwin 15.0.0 Darwin Kernel Version 15.0.0: Wed Aug 26 19:41:34 PDT 2015; root:xnu-3247.1.106~5/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.0.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.0.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
-Class Apple | Mac OS X | 10.11.X | general purpose
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 SEQ(SP=F7-10B%GCD=1-6%ISR=103-10D%TI=RD%CI=RI%TS=A)
 OPS(O1=M3FD8NW5NNT11SLL%O2=M3FD8NW5NNT11SLL%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11SLL%O5=M3FD8NW5NNT11SLL%O6=M3FD8NNT11SLL)
@@ -4830,10 +4830,10 @@ IE(R=N)
 # Darwin 15.2.0 (OS X 10.11.4)
 # Darwin 15.3.0 Darwin Kernel Version 15.3.0: Thu Dec 10 18:40:58 PST 2015; root:xnu-3248.30.4~1/RELEASE_X86_64 x86_64
 # Darwin 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.4.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.4.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
-Class Apple | Mac OS X | 10.11.X | general purpose
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 SEQ(SP=F5-109%GCD=1-6%ISR=F7-115%TI=RD%CI=RD|RI%II=I|RI|BI%TS=A)
 OPS(O1=M3FD8NW5NNT11SLL%O2=M3FD8NW5NNT11SLL%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11SLL%O5=M3FD8NW5NNT11SLL%O6=M3FD8NNT11SLL)
@@ -4850,8 +4850,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin Kernel Version 14.1.0 root:xnu-2782.10.72~2/REALESE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10.2 (Yosemite) (Darwin 14.1.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10.2 (Yosemite) (Darwin 14.1.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10.2 auto
 SEQ(SP=100-10A%GCD=1-6%ISR=105-10F%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M553NW5NNT11SLL%O2=M553NW5NNT11SLL%O3=M553NW5NNT11%O4=M553NW5NNT11SLL%O5=M553NW5NNT11SLL%O6=M553NNT11SLL)
@@ -4870,10 +4870,10 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Darwin 14.1.0 Darwin Kernel Version 14.1.0: Thu Feb 26 19:26:47 PST 2015; root:xnu-2782.10.73~1/RELEASE_X86_64 x86_64
 # iOS 9
 # Darwin 15.0.0 Darwin Kernel Version 15.0.0: Tue Sep 22 20:33:10 PDT 2015; root:xnu-3247.10.11.1.1~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10.2 (Yosemite) - 10.11.1 (El Capitan) or iOS 9 (Darwin 14.1.0 - 15.0.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10.2 (Yosemite) - 10.11.1 (El Capitan) or iOS 9 (Darwin 14.1.0 - 15.0.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
-Class Apple | Mac OS X | 10.11.X | general purpose
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 Class Apple | iOS | 9.X | general purpose
 CPE cpe:/o:apple:iphone_os:9 auto
@@ -4894,10 +4894,10 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Localhost, U1.RIPCK=G
 # Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
 # Darwin 15.0.0 Darwin Kernel Version 15.0.0: Wed Aug 26 19:41:34 PDT 2015; root:xnu-3247.1.106~5/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10.3 (Yosemite) - 10.11.0 (El Capitan) (Darwin 14.3.0 - 15.0.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
+Fingerprint Apple OS X 10.10.3 (Yosemite) - 10.11.0 (El Capitan) (Darwin 14.3.0 - 15.0.0)
+Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
-Class Apple | Mac OS X | 10.11.X | general purpose
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 SEQ(SP=FC-106%GCD=1-6%ISR=105-10F%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M3FD8NW5NNT11SLL%O2=M3FD8NW5NNT11SLL%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11SLL%O5=M3FD8NW5NNT11SLL%O6=M3FD8NNT11SLL)
@@ -4914,8 +4914,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin 15.0.0 Darwin Kernel Version 15.0.0: Sat Sep 19 15:53:46 PDT 2015; root:xnu-3247.10.11~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.11 (El Capitan) (Darwin 15.0.0)
-Class Apple | Mac OS X | 10.11.X | general purpose
+Fingerprint Apple OS X 10.11 (El Capitan) (Darwin 15.0.0)
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11 auto
 SEQ(SP=102-10C%GCD=1-6%ISR=103-10D%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M566NW5NNT11SLL%O2=M566NW5NNT11SLL%O3=M566NW5NNT11%O4=M566NW5NNT11SLL%O5=M566NW5NNT11SLL%O6=M566NNT11SLL)
@@ -4932,8 +4932,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin 15.2.0 Darwin Kernel Version 15.2.0: Fri Nov 13 19:56:56 PST 2015; root:xnu-3248.20.55~2/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.11.2 (El Capitan) (Darwin 15.2.0)
-Class Apple | Mac OS X | 10.11.X | general purpose
+Fingerprint Apple OS X 10.11.2 (El Capitan) (Darwin 15.2.0)
+Class Apple | OS X | 10.11.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.11.2 auto
 SEQ(SP=FB-105%GCD=1-6%ISR=FC-106%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%O6=M5B4NNT11SLL)
@@ -6330,9 +6330,9 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint Apple Mac OS X 10.7.0 (Lion) - 10.11 (El Capitan) or iOS 4.1 - 9 (Darwin 10.0.0 - 15.0.0)
 Class Apple | Mac OS X | 10.7.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.7
-Class Apple | Mac OS X | 10.8.X | general purpose
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8
-Class Apple | Mac OS X | 10.9.X | general purpose
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9
 Class Apple | iOS | 4.X | media device
 CPE cpe:/o:apple:iphone_os:4
@@ -6828,9 +6828,9 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Apple | Mac OS X | 10.8.X
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion)
-Class Apple | Mac OS X | 10.8.X | general purpose
+# Apple | OS X | 10.8.X
+Fingerprint Apple OS X 10.8 (Mountain Lion)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8 auto
 SEQ(SP=FC-106%GCD=1-6%ISR=100-10A%TI=RD%CI=RI%II=RI%TS=A|D)
 OPS(O1=M574NW4NNT11SLL%O2=M574NW4NNT11SLL%O3=M574NW4NNT11%O4=M574NW4NNT11SLL%O5=M574NW4NNT11SLL%O6=M574NNT11SLL)
@@ -6847,8 +6847,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin 12.4.0 Darwin Kernel Version 12.4.0: Wed May  1 17:57:12 PDT 2013; root:xnu-2050.24.15~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion) (Darwin 12.4.0)
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8 (Mountain Lion) (Darwin 12.4.0)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8 auto
 SEQ(SP=101-10B%GCD=1-6%ISR=100-10A%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M5B4NW4NNT11SLL%O2=M5B4NW4NNT11SLL%O3=M5B4NW4NNT11%O4=M5B4NW4NNT11SLL%O5=M5B4NW4NNT11SLL%O6=M5B4NNT11SLL)
@@ -6870,8 +6870,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Mac OS X 10.9 Build 13A603
 # Darwin 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64
 # OSX 10.9.5 Mavericks (Darwin 13.4.0)
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) (Darwin 12.0.0 - 13.4.0) or iOS 5.0.1
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) (Darwin 12.0.0 - 13.4.0) or iOS 5.0.1
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8
 Class Apple | iOS | 5.X | phone
 CPE cpe:/o:apple:iphone_os:5.0.1 auto
@@ -6901,8 +6901,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # iPad mini, iOS 6.1.3
 # Apple iPod, OS Version: 6.1.5 (10B400)
 # Darwin 13.4.0 Darwin Kernel Version 13.4.0: Sun Aug 17 19:50:11 PDT 2014; root:xnu-2422.115.4~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) or iOS 5.1.1 - 6.1.5 (Darwin 12.0.0 - 13.4.0)
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8 (Mountain Lion) - 10.9 (Mavericks) or iOS 5.1.1 - 6.1.5 (Darwin 12.0.0 - 13.4.0)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8 auto
 Class Apple | iOS | 5.X | media device
 CPE cpe:/o:apple:iphone_os:5 auto
@@ -6927,10 +6927,10 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Darwin 12.0.0 Darwin Kernel Version 12.0.0: Sun Jun 24 23:00:16 PDT 2012; root:xnu-2050.7.9~1/RELEASE_X86_64 x86_64
 # Darwin 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64
 # Darwin -mbp.fios-router.home 13.4.0 Darwin Kernel Version 13.4.0: Wed Mar 18 16:20:14 PDT 2015; root:xnu-2422.115.14~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8 (Mountain Lion) - 10.9.5 (Mavericks) (Darwin 12.0.0 - 13.4.0)
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8 (Mountain Lion) - 10.9.5 (Mavericks) (Darwin 12.0.0 - 13.4.0)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8
-Class Apple | Mac OS X | 10.9.X | general purpose
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9 auto
 SEQ(SP=FA-109%GCD=1-6%ISR=FD-10F%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M3FD8NW4NNT11SLL%O2=M3FD8NW4NNT11SLL%O3=M3FD8NW4NNT11%O4=M3FD8NW4NNT11SLL%O5=M3FD8NW4NNT11SLL%O6=M3FD8NNT11SLL)
@@ -6948,8 +6948,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # OSX Mountain Lion: Darwin 12.0.0 Darwin Kernel Version 12.0.0: Sun Jun 24 23:00:16 PDT 2012; root:xnu-2050.7.9~1/RELEASE_X86_64 x86_64
 # Darwin 12.1.0 Darwin Kernel Version 12.1.0: Tue Aug 14 13:29:55 PDT 2012; root:xnu-2050.9.2~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8 - 10.8.1 (Mountain Lion) (Darwin 12.0.0 - 12.1.0)
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8 - 10.8.1 (Mountain Lion) (Darwin 12.0.0 - 12.1.0)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8
 SEQ(SP=FA-104%GCD=1-6%ISR=FD-109%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M3FD8NW8NNT11SLL%O2=M3FD8NW8NNT11SLL%O3=M3FD8NW8NNT11%O4=M3FD8NW8NNT11SLL%O5=M3FD8NW8NNT11SLL%O6=M3FD8NNT11SLL)
@@ -6966,8 +6966,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # 12.2.0 Darwin Kernel Version 12.2.0: Sat Aug 25 00:48:52 PDT 2012; root:xnu-2050.18.24~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.8.2 (Mountain Lion) (Darwin 12.2.0)
-Class Apple | Mac OS X | 10.8.X | general purpose
+Fingerprint Apple OS X 10.8.2 (Mountain Lion) (Darwin 12.2.0)
+Class Apple | OS X | 10.8.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.8.2 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=106-110%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M5B4NW4NNT11SLL%O2=M5B4NW4NNT11SLL%O3=M5B4NW4NNT11%O4=M5B4NW4NNT11SLL%O5=M5B4NW4NNT11SLL%O6=M5B4NNT11SLL)
@@ -6986,8 +6986,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # localhost scan
 # Darwin 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64
 # Darwin 13.0.2 Darwin Kernel Version 13.0.2: Sun Sep 29 19:38:57 PDT 2013; root:xnu-2422.75.4~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.0.2)
-Class Apple | Mac OS X | 10.9.X | general purpose
+Fingerprint Apple OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.0.2)
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9 auto
 SEQ(SP=100-10A%GCD=1-6%ISR=108-112%TI=RD%CI=RD%TS=U)
 OPS(O1=M3FD8SLL%O2=M3FD8SLL%O3=M3FD8%O4=M3FD8SLL%O5=M3FD8SLL%O6=M3FD8SLL)
@@ -7005,8 +7005,8 @@ IE(R=N)
 
 # Darwin thunderbolt.local 13.0.0 Darwin Kernel Version 13.0.0: Wed Jul 17 01:22:21 PDT 2013; root:xnu-2422.1.43~2/RELEASE_X86_64 x86_64
 # Darwin hostname 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.2.0)
-Class Apple | Mac OS X | 10.9.X | general purpose
+Fingerprint Apple OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.2.0)
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9 auto
 SEQ(SP=FE-10C%GCD=1-6%ISR=104-10E%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M3FD8NW4NNT11SLL%O2=M3FD8NW4NNT11SLL%O3=M3FD8NW4NNT11%O4=M3FD8NW4NNT11SLL%O5=M3FD8NW4NNT11SLL%O6=M3FD8NNT11SLL)
@@ -7024,8 +7024,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64
 # OSX 10.9.3 (Darwin 13.2)
-Fingerprint Apple Mac OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.2.0)
-Class Apple | Mac OS X | 10.9.X | general purpose
+Fingerprint Apple OS X 10.9 (Mavericks) (Darwin 13.0.0 - 13.2.0)
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=107-111%TI=RD%II=RI%TS=A)
 OPS(O1=M3FD8NW4NNT11SLL%O2=M3FD8NW4NNT11SLL%O3=M3FD8NW4NNT11%O4=M3FD8NW4NNT11SLL%O5=M3FD8NW4NNT11SLL%O6=M3FD8NNT11SLL)
@@ -7042,8 +7042,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G|Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # OS X 10.9
-Fingerprint Apple Mac OS X 10.9 (Mavericks) (Darwin 13.0.0)
-Class Apple | Mac OS X | 10.9.X | general purpose
+Fingerprint Apple OS X 10.9 (Mavericks) (Darwin 13.0.0)
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9 auto
 SEQ(SP=FA-104%GCD=2|4|6|8|A%ISR=108-112%TI=RD%CI=RD%II=RI%TS=A)
 OPS(O1=M56ANW5NNT11SLL%O2=M56ANW5NNT11SLL%O3=M56ANW5NNT11%O4=M56ANW5NNT11SLL%O5=M56ANW5NNT11SLL%O6=M56ANNT11SLL)
@@ -7060,8 +7060,8 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.9.3 (Mavericks) (Darwin 13.2.0)
-Class Apple | Mac OS X | 10.9.X | general purpose
+Fingerprint Apple OS X 10.9.3 (Mavericks) (Darwin 13.2.0)
+Class Apple | OS X | 10.9.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.9.3 auto
 SEQ(SP=F8-102%GCD=1-6%ISR=108-112%TI=RD%CI=RD%TS=A)
 OPS(O1=M585NW4NNT11SLL%O2=M585NW4NNT11SLL%O3=M585NW4NNT11%O4=M585NW4NNT11SLL%O5=M585NW4NNT11SLL%O6=M585NNT11SLL)
diff --git a/nmap-service-probes b/nmap-service-probes
index 1e04868b2..646a922a4 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -12356,7 +12356,7 @@ match afp m|^\x01\x03\0\0........\0\0\0\0........\x8f\xfb.([^\0\x01]+)[\0\x01].*
 match afp m|^\x01\x03\0\0........\0\0\0\0........\x8f\xfb.([^\0\x01]+)[\0\x01].*\tMacintosh\x04\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x06AFP2\.2.\tDHCAST128|s p/Apple AFP/ i/name: $1; protocol 3.2; Mac OS X 10.3 - 10.5/ o/Mac OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x/a
 
 # Flags \x9f\xf3
-match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xf3.([^\0\x01]+)[\0\x01].*?(i?Mac(?:mini|Pro|Book(?:Air|Pro)?)?\d+,\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03=s p/Apple AFP/ i/name: $1; protocol 3.4; Mac OS X 10.9 - 10.11; $2/ o/Mac OS X/ cpe:/a:apple:afp_server/ cpe:/o:apple:mac_os_x:10.10/ cpe:/o:apple:mac_os_x:10.11/ cpe:/o:apple:mac_os_x:10.9/
+match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xf3.([^\0\x01]+)[\0\x01].*?(i?Mac(?:mini|Pro|Book(?:Air|Pro)?)?\d+,\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03=s p/Apple AFP/ i/name: $1; protocol 3.4; OS X 10.9 - 10.11; $2/ o/OS X/ cpe:/a:apple:afp_server/ cpe:/o:apple:mac_os_x:10.10/ cpe:/o:apple:mac_os_x:10.11/ cpe:/o:apple:mac_os_x:10.9/
 match afp m|^\x01\x03\0\0........\0\0\0\0........\x9f\xf3.([^\0\x01]+).*?VMware(\d+),(\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03|s p/Apple AFP/ i/name: $1; protocol 3.4; VMware $2.$3/ o/Mac OS X/ cpe:/a:apple:afp_server/ cpe:/o:apple:mac_os_x/a
 
 # Flags \x9f\xfb.
@@ -12364,7 +12364,7 @@ match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*
 match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*?(i?Mac(?:mini|Pro|Book(?:Air|Pro)?)?\d+,\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x05\tDHCAST128\x04DHX2\x06Recon1\rClient Krb v2\x03GSS.*\x1b\$not_defined_in_RFC4178@please_ignore=s p/Apple AFP/ i/name: $1; protocol 3.4; Mac OS X 10.6 - 10.8; $2/ o/Mac OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x:10.6/ cpe:/o:apple:mac_os_x:10.7/ cpe:/o:apple:mac_os_x:10.8/
 match afp m|^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*VMware(\d+),(\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x06\tDHCAST128\x04DHX2\x06Recon1\rClient Krb v2\x03GSS\x0fNo User Authent.*\x1b\$not_defined_in_RFC4178@please_ignore$|s p/Apple AFP/ i/name: $1; protocol 3.4; Mac OS X 10.6; VMware $2.$3/ o/Mac OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x/a
 match afp m|^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*Xserve\d+,\d+\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x05\tDHCAST128|s p/Apple AFP/ i/name: $1; protocol 3.4; Xserve/ o/Mac OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x/a
-match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*?(i?Mac(?:mini|Pro|Book(?:Air|Pro)?)?\d+,\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x05\tDHCAST128\x04DHX2\x06Recon1\x03GSS\x0fNo User Authent=s p/Apple AFP/ i/name: $1; protocol 3.4; Mac OS X 10.8; $2/ o/Mac OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x:10.8/
+match afp m=^\x01\x03\0\0........\0\0\0\0........\x9f\xfb.([^\0\x01]+)[\0\x01].*?(i?Mac(?:mini|Pro|Book(?:Air|Pro)?)?\d+,\d+)\x05\x06AFP3\.4\x06AFP3\.3\x06AFP3\.2\x06AFP3\.1\x06AFPX03\x05\tDHCAST128\x04DHX2\x06Recon1\x03GSS\x0fNo User Authent=s p/Apple AFP/ i/name: $1; protocol 3.4; OS X 10.8; $2/ o/OS X/ cpe:/a:apple:afp_server/a cpe:/o:apple:mac_os_x:10.8/
 
 softmatch afp m|^\x01\x03\0\0........\0\0\0\0.*AFP|s