diff --git a/cpe-remap.yaml b/cpe-remap.yaml
index b8d93248..703d8249 100644
--- a/cpe-remap.yaml
+++ b/cpe-remap.yaml
@@ -169,9 +169,6 @@ mappings:
       vendor: parallels
     proftpd_project:
       vendor: proftpd
-    progress:
-      products:
-        openedge_explorer: openedge
     pulse_secure:
       vendor: pulsesecure
     realvnc_ltd.:
diff --git a/xml/favicons.xml b/xml/favicons.xml
index 2aeda220..cedd6201 100644
--- a/xml/favicons.xml
+++ b/xml/favicons.xml
@@ -442,7 +442,7 @@
     <param pos="0" name="service.vendor" value="Progress"/>
     <param pos="0" name="service.product" value="OpenEdge Explorer"/>
     <param pos="0" name="service.certainty" value="0.5"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge_explorer:-"/>
   </fingerprint>
 
   <fingerprint pattern="^297a81069094d00a052733d3a0537d18$">
@@ -945,6 +945,7 @@
     <param pos="0" name="service.vendor" value="Tenable"/>
     <param pos="0" name="service.product" value="Security Center"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:tenable:security_center:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:78ee71862e89db1b1870197b40d026e5|799f70b71314a7508326d1d2f68f7519)$">
@@ -1333,12 +1334,12 @@
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.certainty" value="0.5"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:af13b379bdb4ae7a5e68d9aa4419b2e4|cd844ad9671131f5464458a2ef58b7bc|c32e2dc4d7caedd5cefc9d44cc4f62ec)$">
diff --git a/xml/html_title.xml b/xml/html_title.xml
index 1afea6f3..7a18a42c 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -3000,7 +3000,7 @@
     <example>OpenEdge Explorer</example>
     <param pos="0" name="service.vendor" value="Progress"/>
     <param pos="0" name="service.product" value="OpenEdge Explorer"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge_explorer:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Consul by HashiCorp$">
diff --git a/xml/http_cookies.xml b/xml/http_cookies.xml
index e9064a3a..6f30ae75 100644
--- a/xml/http_cookies.xml
+++ b/xml/http_cookies.xml
@@ -205,11 +205,11 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^st8id=">
diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index 897304d6..00799a67 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -2198,11 +2198,11 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^CE_E$">
diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 63a4afbb..10df86e0 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1572,6 +1572,7 @@
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MaxScale"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:maxscale:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-falcon-alpha-community-nt" flags="REG_ICASE">
diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 9ef904b7..73505c98 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1610,11 +1610,11 @@
     <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_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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Cisco 761 Software Version (.*) -">
diff --git a/xml/x509_issuers.xml b/xml/x509_issuers.xml
index b14779b0..98ca4732 100644
--- a/xml/x509_issuers.xml
+++ b/xml/x509_issuers.xml
@@ -216,11 +216,11 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^CN=Temporary CA [a-fA-F0-9]{8}\-[a-fA-F0-9]{4}\-[a-fA-F0-9]{4}\-[a-fA-F0-9]{4}\-[a-fA-F0-9]{12},OU=Temporary CA">
diff --git a/xml/x509_subjects.xml b/xml/x509_subjects.xml
index 37fe6bd9..01fd1ec4 100644
--- a/xml/x509_subjects.xml
+++ b/xml/x509_subjects.xml
@@ -398,11 +398,11 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <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"/>
     <param pos="0" name="hw.device" value="Firewall"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
 
   <fingerprint pattern="^SERIALNUMBER=([a-zA-Z0-9]+),CN=DEVICE-vWLC,O=Cisco Virtual WLC$">