diff --git a/data/theme_vulns.xml b/data/theme_vulns.xml
index 113e48b7..38bcee97 100644
--- a/data/theme_vulns.xml
+++ b/data/theme_vulns.xml
@@ -1309,9 +1309,9 @@
 
   <theme name="classic">
     <vulnerability>
-      <title>CVE-2007-4483: Classic v1.5 Theme PHP_SELF XSS</title>
+      <title>Classic v1.5 Theme PHP_SELF XSS</title>
       <reference>http://osvdb.org/38450</reference>
-      <reference>http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-4483</reference>
+      <cve>2007-4483</cve>
       <type>XSS</type>
     </vulnerability>
   </theme>
diff --git a/data/wp_vulns.xml b/data/wp_vulns.xml
index 21469a5c..03c91ef7 100644
--- a/data/wp_vulns.xml
+++ b/data/wp_vulns.xml
@@ -21,10 +21,11 @@
       <fixed_in>3.5.2</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>CVE-2013-2173: WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
+      <title>WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
       <reference>http://seclists.org/fulldisclosure/2013/Jun/65</reference>
       <reference>http://secunia.com/advisories/53676/</reference>
       <reference>http://osvdb.org/94235</reference>
+      <cve>2013-2173</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>
@@ -71,10 +72,11 @@
       <fixed_in>3.5.2</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>CVE-2013-2173: WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
+      <title>WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
       <reference>http://seclists.org/fulldisclosure/2013/Jun/65</reference>
       <reference>http://secunia.com/advisories/53676/</reference>
       <reference>http://osvdb.org/94235</reference>
+      <cve>2013-2173</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>
@@ -103,10 +105,11 @@
       <fixed_in>3.5.2</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>CVE-2013-2173: WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
+      <title>WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
       <reference>http://seclists.org/fulldisclosure/2013/Jun/65</reference>
       <reference>http://secunia.com/advisories/53676/</reference>
       <reference>http://osvdb.org/94235</reference>
+      <cve>2013-2173</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>
@@ -140,10 +143,11 @@
       <fixed_in>3.5.2</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>CVE-2013-2173: WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
+      <title>WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
       <reference>http://seclists.org/fulldisclosure/2013/Jun/65</reference>
       <reference>http://secunia.com/advisories/53676/</reference>
       <reference>http://osvdb.org/94235</reference>
+      <cve>2013-2173</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>
@@ -172,10 +176,11 @@
       <fixed_in>3.5.2</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>CVE-2013-2173: WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
+      <title>WordPress 3.4-3.5.1 DoS in class-phpass.php</title>
       <reference>http://seclists.org/fulldisclosure/2013/Jun/65</reference>
       <reference>http://secunia.com/advisories/53676/</reference>
       <reference>http://osvdb.org/94235</reference>
+      <cve>2013-2173</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>
@@ -1006,8 +1011,9 @@
 
   <wordpress version="2.5">
     <vulnerability>
-      <title>CVE-2008-1930: Wordpress 2.5 Cookie Integrity Protection Vulnerability</title>
+      <title>Wordpress 2.5 Cookie Integrity Protection Vulnerability</title>
       <reference>http://www.securityfocus.com/archive/1/archive/1/491356/100/0/threaded</reference>
+      <cve>2008-1930</cve>
       <type>UNKNOWN</type>
     </vulnerability>
     <vulnerability>