diff --git a/bin/hardening/10.5_lock_inactive_user_account.sh b/bin/hardening/5.4.1.4_lock_inactive_user_account.sh
similarity index 97%
rename from bin/hardening/10.5_lock_inactive_user_account.sh
rename to bin/hardening/5.4.1.4_lock_inactive_user_account.sh
index 5843d62..efd5c82 100755
--- a/bin/hardening/10.5_lock_inactive_user_account.sh
+++ b/bin/hardening/5.4.1.4_lock_inactive_user_account.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.5 Lock Inactive User Accounts (Scored)
+# 5.4.1.4 Lock Inactive User Accounts (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/10.2_disable_system_accounts.sh b/bin/hardening/5.4.2_disable_system_accounts.sh
similarity index 98%
rename from bin/hardening/10.2_disable_system_accounts.sh
rename to bin/hardening/5.4.2_disable_system_accounts.sh
index d46b321..76fedbf 100755
--- a/bin/hardening/10.2_disable_system_accounts.sh
+++ b/bin/hardening/5.4.2_disable_system_accounts.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.2 Disable System Accounts (Scored)
+# 5.4.2 Ensure system accounts are non-login (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/10.3_default_root_group.sh b/bin/hardening/5.4.3_default_root_group.sh
similarity index 95%
rename from bin/hardening/10.3_default_root_group.sh
rename to bin/hardening/5.4.3_default_root_group.sh
index 3ea043b..f6c7bd1 100755
--- a/bin/hardening/10.3_default_root_group.sh
+++ b/bin/hardening/5.4.3_default_root_group.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.3 Set Default Group for root Account (Scored)
+# 5.4.3 Ensure default group for the root account is GID 0 (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/10.4_default_umask.sh b/bin/hardening/5.4.4_default_umask.sh
similarity index 98%
rename from bin/hardening/10.4_default_umask.sh
rename to bin/hardening/5.4.4_default_umask.sh
index 2d533f0..2276f27 100755
--- a/bin/hardening/10.4_default_umask.sh
+++ b/bin/hardening/5.4.4_default_umask.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 10.4 Set Default umask for Users (Scored)
+# 5.4.4 Ensure default user umask is 027 or more restrictive (Scored)
 #
 
 set -e # One error, it's over
diff --git a/tests/hardening/10.3_default_root_group.sh b/tests/hardening/5.4.1.4_lock_inactive_user_account.sh
similarity index 100%
rename from tests/hardening/10.3_default_root_group.sh
rename to tests/hardening/5.4.1.4_lock_inactive_user_account.sh
diff --git a/tests/hardening/10.2_disable_system_accounts.sh b/tests/hardening/5.4.2_disable_system_accounts.sh
similarity index 100%
rename from tests/hardening/10.2_disable_system_accounts.sh
rename to tests/hardening/5.4.2_disable_system_accounts.sh
diff --git a/tests/hardening/10.4_default_umask.sh b/tests/hardening/5.4.3_default_root_group.sh
similarity index 100%
rename from tests/hardening/10.4_default_umask.sh
rename to tests/hardening/5.4.3_default_root_group.sh
diff --git a/tests/hardening/10.5_lock_inactive_user_account.sh b/tests/hardening/5.4.4_default_umask.sh
similarity index 100%
rename from tests/hardening/10.5_lock_inactive_user_account.sh
rename to tests/hardening/5.4.4_default_umask.sh