diff --git a/modules/vulnerabilities/unix/ctf/programming/math_challenge/manifests/install.pp b/modules/vulnerabilities/unix/ctf/programming/math_challenge/manifests/install.pp
index 173d133c3..aa3e3a132 100644
--- a/modules/vulnerabilities/unix/ctf/programming/math_challenge/manifests/install.pp
+++ b/modules/vulnerabilities/unix/ctf/programming/math_challenge/manifests/install.pp
@@ -5,7 +5,7 @@ class math_challenge::install {
   ::secgen_functions::install_setgid_script { $challenge_name:
     source_module_name => $module_name,
     challenge_name     => $challenge_name,
-    script_name        => "$challenge_name  .rb",
+    script_name        => "$challenge_name.rb",
     script_data        => $secgen_params['script_data'],
     group              => $secgen_params['group'],
     account            => $secgen_params['account'],
diff --git a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml
index 6b4f828d4..828af3502 100644
--- a/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/ftp/proftpd_133c_backdoor/secgen_metadata.xml
@@ -15,6 +15,7 @@
   <privilege>root_rwx</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>server_name</read_fact>
   <read_fact>strings_to_leak</read_fact>
@@ -42,7 +43,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <!--<cve></cve>-->
   <cvss_base_score>10</cvss_base_score>
   <cvss_vector>AV:N/AC:L/Au:N/C:C/I:C/A:C</cvss_vector>
diff --git a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/secgen_metadata.xml b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/secgen_metadata.xml
index d03442abb..1495ed61c 100644
--- a/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/ftp/vsftpd_234_backdoor/secgen_metadata.xml
@@ -15,6 +15,7 @@
   <privilege>root_rwx</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>anonymous_ftp</read_fact>
   <read_fact>ftpd_banner</read_fact>
@@ -36,7 +37,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <!--<cve></cve>-->
   <cvss_base_score>10</cvss_base_score>
   <cvss_vector>AV:N/AC:L/Au:N/C:C/I:C/A:C</cvss_vector>
diff --git a/modules/vulnerabilities/unix/irc/unrealirc_3281_backdoor/secgen_metadata.xml b/modules/vulnerabilities/unix/irc/unrealirc_3281_backdoor/secgen_metadata.xml
index f8079bf78..f0f2b1842 100644
--- a/modules/vulnerabilities/unix/irc/unrealirc_3281_backdoor/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/irc/unrealirc_3281_backdoor/secgen_metadata.xml
@@ -14,6 +14,7 @@
   <privilege>user_rwx</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -72,7 +73,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <!--<cve></cve>-->
   <cvss_base_score>10</cvss_base_score>
   <cvss_vector>AV:N/AC:L/Au:N/C:C/I:C/A:C</cvss_vector>
diff --git a/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml b/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml
index d16534848..769656449 100644
--- a/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/local/chkrootkit/secgen_metadata.xml
@@ -15,6 +15,7 @@
   <privilege>root_rwx</privilege>
   <access>local</access>
   <platform>linux</platform>
+  <difficulty>high</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -34,7 +35,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>high</difficulty>
   <cve>CVE-2014-0476</cve>
   <cvss_base_score>3.7</cvss_base_score>
   <reference>https://www.rapid7.com/db/modules/exploit/unix/local/chkrootkit</reference>
diff --git a/modules/vulnerabilities/unix/local/setuid_nmap/secgen_metadata.xml b/modules/vulnerabilities/unix/local/setuid_nmap/secgen_metadata.xml
index 16ea0dad4..9c28656e1 100644
--- a/modules/vulnerabilities/unix/local/setuid_nmap/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/local/setuid_nmap/secgen_metadata.xml
@@ -12,6 +12,7 @@
   <privilege>root_rwx</privilege>
   <access>local</access>
   <platform>linux</platform>
+  <difficulty>medium</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -23,9 +24,6 @@
     <generator type="filename_generator"/>
   </default_input>
 
-  <!--optional vulnerability details-->
-  <difficulty>medium</difficulty>
-
   <requires>
     <module_path>modules/utilities/unix/audit_tools/scanners/nmap</module_path>
   </requires>
diff --git a/modules/vulnerabilities/unix/misc/distcc_exec/secgen_metadata.xml b/modules/vulnerabilities/unix/misc/distcc_exec/secgen_metadata.xml
index 30b78f65a..722ad41e1 100644
--- a/modules/vulnerabilities/unix/misc/distcc_exec/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/misc/distcc_exec/secgen_metadata.xml
@@ -12,6 +12,7 @@
   <privilege>user_rwx</privilege>
   <access>remote</access>
   <platform>unix</platform>
+  <difficulty>medium</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -27,7 +28,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>medium</difficulty>
   <cve>CVE-2004-2687</cve>
   <cvss_base_score>9.3</cvss_base_score>
   <cvss_vector>AV:N/AC:M/Au:N/C:C/I:C/A:C</cvss_vector>
diff --git a/modules/vulnerabilities/unix/nfs/nfs_overshare/secgen_metadata.xml b/modules/vulnerabilities/unix/nfs/nfs_overshare/secgen_metadata.xml
index 528b7427e..aa8d87c6d 100644
--- a/modules/vulnerabilities/unix/nfs/nfs_overshare/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/nfs/nfs_overshare/secgen_metadata.xml
@@ -12,6 +12,7 @@
   <privilege>info_leak</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>images_to_leak</read_fact>
@@ -55,7 +56,6 @@
     <!--</encoder>-->
   <!--</default_input>-->
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <!--<cve></cve>-->
   <cvss_base_score>4.3</cvss_base_score>
   <cvss_vector>AV:N/AC:M/Au:N/C:P/I:N/A:N</cvss_vector>
diff --git a/modules/vulnerabilities/unix/nfs/nfs_rootshare/secgen_metadata.xml b/modules/vulnerabilities/unix/nfs/nfs_rootshare/secgen_metadata.xml
index 1c6213e29..6601ed589 100644
--- a/modules/vulnerabilities/unix/nfs/nfs_rootshare/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/nfs/nfs_rootshare/secgen_metadata.xml
@@ -12,6 +12,7 @@
   <privilege>root_rw</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>images_to_leak</read_fact>
@@ -37,7 +38,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <!--<cve></cve>-->
   <cvss_base_score>9.3</cvss_base_score>
   <cvss_vector>AV:N/AC:M/Au:N/C:C/I:C/A:C</cvss_vector>
diff --git a/modules/vulnerabilities/unix/smb/samba_public_writable_share/secgen_metadata.xml b/modules/vulnerabilities/unix/smb/samba_public_writable_share/secgen_metadata.xml
index ecb80b4aa..b6fb13f48 100644
--- a/modules/vulnerabilities/unix/smb/samba_public_writable_share/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/smb/samba_public_writable_share/secgen_metadata.xml
@@ -13,6 +13,7 @@
   <privilege>info_leak</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -63,9 +64,6 @@
     <value>true</value>
   </default_input>
 
-  <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
-
   <!--optional details-->
   <reference>http://allarsblog.com/2015/11/07/Setting-Up-Samba-No-Security/</reference>
   <software_name>smbd</software_name>
diff --git a/modules/vulnerabilities/unix/smb/samba_symlink_traversal/secgen_metadata.xml b/modules/vulnerabilities/unix/smb/samba_symlink_traversal/secgen_metadata.xml
index 01a6e93c6..14af2a38c 100644
--- a/modules/vulnerabilities/unix/smb/samba_symlink_traversal/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/smb/samba_symlink_traversal/secgen_metadata.xml
@@ -13,6 +13,7 @@
   <privilege>user_rw</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>strings_to_leak</read_fact>
   <read_fact>leaked_filenames</read_fact>
@@ -57,9 +58,6 @@
     <value>true</value>
   </default_input>
 
-  <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
-
   <!--optional details-->
   <reference>https://www.samba.org/samba/news/symlink_attack.html</reference>
   <reference>https://www.rapid7.com/db/modules/auxiliary/admin/smb/samba_symlink_traversal</reference>
diff --git a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
index 33588d598..8798e6cd5 100644
--- a/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/gitlist_040/secgen_metadata.xml
@@ -17,6 +17,7 @@
   <privilege>user_rwx</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>low</difficulty>
 
   <read_fact>port</read_fact>
   <read_fact>strings_to_leak</read_fact>
@@ -39,7 +40,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>low</difficulty>
   <cve>CVE-2014-4511</cve>
 
   <cvss_base_score>7.5</cvss_base_score>
diff --git a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
index 8cc294920..659e017f1 100644
--- a/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/webapp/moinmoin_195/secgen_metadata.xml
@@ -17,6 +17,7 @@
   <privilege>user_rwx</privilege>
   <access>remote</access>
   <platform>linux</platform>
+  <difficulty>medium</difficulty>
 
   <read_fact>port</read_fact>
   <read_fact>strings_to_leak</read_fact>
@@ -49,7 +50,6 @@
   </default_input>
 
   <!--optional vulnerability details-->
-  <difficulty>medium</difficulty>
   <cve>CVE-2012-6080</cve>
   <cve>CVE-2012-6081</cve>