diff --git a/bin/hardening/99.4_net_fw_default_policy_drop.sh b/bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh
similarity index 96%
rename from bin/hardening/99.4_net_fw_default_policy_drop.sh
rename to bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh
index d683e4e..bf68799 100755
--- a/bin/hardening/99.4_net_fw_default_policy_drop.sh
+++ b/bin/hardening/3.5.1.1_net_fw_default_policy_drop.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Check iptables firewall default policy for DROP on INPUT and FORWARD.
+# 3.5.1.1 Ensure default deny firewall policy (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/99.3.3_acc_pam_sha512.sh b/bin/hardening/5.3.4_acc_pam_sha512.sh
similarity index 95%
rename from bin/hardening/99.3.3_acc_pam_sha512.sh
rename to bin/hardening/5.3.4_acc_pam_sha512.sh
index 71189af..03f4f7d 100755
--- a/bin/hardening/99.3.3_acc_pam_sha512.sh
+++ b/bin/hardening/5.3.4_acc_pam_sha512.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Check that any password that may exist in /etc/shadow is SHA512 hashed and salted
+# 5.3.4 Ensure password hashing algorithm is SHA-512 (Scored)
 #
 
 set -e # One error, it's over
diff --git a/tests/hardening/99.4_net_fw_default_policy_drop.sh b/tests/hardening/3.5.1.1_net_fw_default_policy_drop.sh
similarity index 100%
rename from tests/hardening/99.4_net_fw_default_policy_drop.sh
rename to tests/hardening/3.5.1.1_net_fw_default_policy_drop.sh
diff --git a/tests/hardening/99.3.3_acc_pam_sha512.sh b/tests/hardening/5.3.4_acc_pam_sha512.sh
similarity index 100%
rename from tests/hardening/99.3.3_acc_pam_sha512.sh
rename to tests/hardening/5.3.4_acc_pam_sha512.sh