diff --git a/bin/hardening/10.1.1_set_password_exp_days.sh b/bin/hardening/5.4.1.1_set_password_exp_days.sh
similarity index 97%
rename from bin/hardening/10.1.1_set_password_exp_days.sh
rename to bin/hardening/5.4.1.1_set_password_exp_days.sh
index 8e01d28..d6aa082 100755
--- a/bin/hardening/10.1.1_set_password_exp_days.sh
+++ b/bin/hardening/5.4.1.1_set_password_exp_days.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.1.1 Set Password Expiration Days (Scored)
+# 5.4.1.1 Ensure password expiration is 365 days or less (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/10.1.2_set_password_min_days_change.sh b/bin/hardening/5.4.1.2_set_password_min_days_change.sh
similarity index 97%
rename from bin/hardening/10.1.2_set_password_min_days_change.sh
rename to bin/hardening/5.4.1.2_set_password_min_days_change.sh
index 2abfe57..98dd466 100755
--- a/bin/hardening/10.1.2_set_password_min_days_change.sh
+++ b/bin/hardening/5.4.1.2_set_password_min_days_change.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.1.2 Set Password Change Minimum Number of Days (Scored)
+# 5.4.1.2 Ensure minimum days between password changes is 7 or more (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/10.1.3_set_password_exp_warning_days.sh b/bin/hardening/5.4.1.3_set_password_exp_warning_days.sh
similarity index 97%
rename from bin/hardening/10.1.3_set_password_exp_warning_days.sh
rename to bin/hardening/5.4.1.3_set_password_exp_warning_days.sh
index 9cfaa66..b57e827 100755
--- a/bin/hardening/10.1.3_set_password_exp_warning_days.sh
+++ b/bin/hardening/5.4.1.3_set_password_exp_warning_days.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.1.3 Set Password Expiring Warning Days (Scored)
+# 5.4.1.3 Ensure password expiration warning days is 7 or more (Scored)
 #
 
 set -e # One error, it's over
diff --git a/tests/hardening/10.1.1_set_password_exp_days.sh b/tests/hardening/5.4.1.1_set_password_exp_days.sh
similarity index 100%
rename from tests/hardening/10.1.1_set_password_exp_days.sh
rename to tests/hardening/5.4.1.1_set_password_exp_days.sh
diff --git a/tests/hardening/10.1.2_set_password_min_days_change.sh b/tests/hardening/5.4.1.2_set_password_min_days_change.sh
similarity index 100%
rename from tests/hardening/10.1.2_set_password_min_days_change.sh
rename to tests/hardening/5.4.1.2_set_password_min_days_change.sh
diff --git a/tests/hardening/10.1.3_set_password_exp_warning_days.sh b/tests/hardening/5.4.1.3_set_password_exp_warning_days.sh
similarity index 100%
rename from tests/hardening/10.1.3_set_password_exp_warning_days.sh
rename to tests/hardening/5.4.1.3_set_password_exp_warning_days.sh