diff --git a/alphabet-compliance/scripts/1117-disable-udf-mounting.sh b/alphabet-compliance/scripts/1117-udf-mounting-disabled.sh
similarity index 100%
rename from alphabet-compliance/scripts/1117-disable-udf-mounting.sh
rename to alphabet-compliance/scripts/1117-udf-mounting-disabled.sh
diff --git a/alphabet-compliance/scripts/1510-restrict-core-dumps.sh b/alphabet-compliance/scripts/1510-core-dumps-restricted-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/1510-restrict-core-dumps.sh
rename to alphabet-compliance/scripts/1510-core-dumps-restricted-cos.sh
diff --git a/alphabet-compliance/scripts/3220-ensure-ICMP-redirects-not-accepted.sh b/alphabet-compliance/scripts/3220-packet-redirect-sending-disabled-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/3220-ensure-ICMP-redirects-not-accepted.sh
rename to alphabet-compliance/scripts/3220-packet-redirect-sending-disabled-cos.sh
diff --git a/alphabet-compliance/scripts/3230-disable-secure-redirects.sh b/alphabet-compliance/scripts/3230-secure-icmp-redirects-not-accepted-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/3230-disable-secure-redirects.sh
rename to alphabet-compliance/scripts/3230-secure-icmp-redirects-not-accepted-cos.sh
diff --git a/alphabet-compliance/scripts/3240-log-suspicious-packets.sh b/alphabet-compliance/scripts/3240-suspicious-packets-logged-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/3240-log-suspicious-packets.sh
rename to alphabet-compliance/scripts/3240-suspicious-packets-logged-cos.sh
diff --git a/alphabet-compliance/scripts/3290-disable-IPv6-router-ads.sh b/alphabet-compliance/scripts/3290-ipv6-router-advertisements-not-accepted-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/3290-disable-IPv6-router-ads.sh
rename to alphabet-compliance/scripts/3290-ipv6-router-advertisements-not-accepted-cos.sh
diff --git a/alphabet-compliance/scripts/4222-compress-large-log-files.sh b/alphabet-compliance/scripts/4222-journald-compress-large-log-files-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/4222-compress-large-log-files.sh
rename to alphabet-compliance/scripts/4222-journald-compress-large-log-files-cos.sh
diff --git a/alphabet-compliance/scripts/4230-set-permissions-of-log-files.sh b/alphabet-compliance/scripts/4230-logfile-permissions-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/4230-set-permissions-of-log-files.sh
rename to alphabet-compliance/scripts/4230-logfile-permissions-cos.sh
diff --git a/alphabet-compliance/scripts/5214-configure-MAC-algorithms.sh b/alphabet-compliance/scripts/5214-strong-mac-algorithm-used.sh
similarity index 100%
rename from alphabet-compliance/scripts/5214-configure-MAC-algorithms.sh
rename to alphabet-compliance/scripts/5214-strong-mac-algorithm-used.sh
diff --git a/alphabet-compliance/scripts/5216-configure-ssh-idle-timeout.sh b/alphabet-compliance/scripts/5216-ssh-idle-timeout-interval-configured.sh
similarity index 100%
rename from alphabet-compliance/scripts/5216-configure-ssh-idle-timeout.sh
rename to alphabet-compliance/scripts/5216-ssh-idle-timeout-interval-configured.sh
diff --git a/alphabet-compliance/scripts/5217-configure-ssh-LoginGraceTime.sh b/alphabet-compliance/scripts/5217-ssh-logingrace-one-minute-or-less.sh
similarity index 100%
rename from alphabet-compliance/scripts/5217-configure-ssh-LoginGraceTime.sh
rename to alphabet-compliance/scripts/5217-ssh-logingrace-one-minute-or-less.sh
diff --git a/alphabet-compliance/scripts/5219-configure-ssh-banner.sh b/alphabet-compliance/scripts/5219-ssh-warning-banner-configured.sh
similarity index 100%
rename from alphabet-compliance/scripts/5219-configure-ssh-banner.sh
rename to alphabet-compliance/scripts/5219-ssh-warning-banner-configured.sh
diff --git a/alphabet-compliance/scripts/5221-disable-ssh-AllowTcpForwarding.sh b/alphabet-compliance/scripts/5221-ssh-allowtcpforwarding-disabled.sh
similarity index 100%
rename from alphabet-compliance/scripts/5221-disable-ssh-AllowTcpForwarding.sh
rename to alphabet-compliance/scripts/5221-ssh-allowtcpforwarding-disabled.sh
diff --git a/alphabet-compliance/scripts/5222-configure-ssh-MaxStartups.sh b/alphabet-compliance/scripts/5222-ssh-maxstartups-configured.sh
similarity index 100%
rename from alphabet-compliance/scripts/5222-configure-ssh-MaxStartups.sh
rename to alphabet-compliance/scripts/5222-ssh-maxstartups-configured.sh
diff --git a/alphabet-compliance/scripts/5223-configure-ssh-MaxSessions.sh b/alphabet-compliance/scripts/5223-ssh-maxsessions-4-or-less.sh
similarity index 100%
rename from alphabet-compliance/scripts/5223-configure-ssh-MaxSessions.sh
rename to alphabet-compliance/scripts/5223-ssh-maxsessions-4-or-less.sh
diff --git a/alphabet-compliance/scripts/5270-configure-ssh-MaxAuthTries.sh b/alphabet-compliance/scripts/5270-ssh-maxauthtries-4-or-less.sh
similarity index 100%
rename from alphabet-compliance/scripts/5270-configure-ssh-MaxAuthTries.sh
rename to alphabet-compliance/scripts/5270-ssh-maxauthtries-4-or-less.sh
diff --git a/alphabet-compliance/scripts/5310-configure-password-requirements.sh b/alphabet-compliance/scripts/5310-password-creation-reqs-configured-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/5310-configure-password-requirements.sh
rename to alphabet-compliance/scripts/5310-password-creation-reqs-configured-cos.sh
diff --git a/alphabet-compliance/scripts/5330-configure-password-reuse.sh b/alphabet-compliance/scripts/5330-password-reuse-limited.sh
similarity index 100%
rename from alphabet-compliance/scripts/5330-configure-password-reuse.sh
rename to alphabet-compliance/scripts/5330-password-reuse-limited.sh
diff --git a/alphabet-compliance/scripts/5340-set-password-hashing-algorithm.sh b/alphabet-compliance/scripts/5340-password-hashing-algorithm-sha-512.sh
similarity index 100%
rename from alphabet-compliance/scripts/5340-set-password-hashing-algorithm.sh
rename to alphabet-compliance/scripts/5340-password-hashing-algorithm-sha-512.sh
diff --git a/alphabet-compliance/scripts/5411-configure-password-expiration.sh b/alphabet-compliance/scripts/5411-password-expiration-365-days-or-less.sh
similarity index 100%
rename from alphabet-compliance/scripts/5411-configure-password-expiration.sh
rename to alphabet-compliance/scripts/5411-password-expiration-365-days-or-less.sh
diff --git a/alphabet-compliance/scripts/5412-configure-password-change-timeframe.sh b/alphabet-compliance/scripts/5412-minimum-days-between-password-changes-7-or-more.sh
similarity index 100%
rename from alphabet-compliance/scripts/5412-configure-password-change-timeframe.sh
rename to alphabet-compliance/scripts/5412-minimum-days-between-password-changes-7-or-more.sh
diff --git a/alphabet-compliance/scripts/5414-configure-inactive-password-timeframe.sh b/alphabet-compliance/scripts/5414-inactive-password-lock-30-days-or-less.sh
similarity index 100%
rename from alphabet-compliance/scripts/5414-configure-inactive-password-timeframe.sh
rename to alphabet-compliance/scripts/5414-inactive-password-lock-30-days-or-less.sh
diff --git a/alphabet-compliance/scripts/5420-configure-system-accounts.sh b/alphabet-compliance/scripts/5420-system-accounts-secured.sh
similarity index 100%
rename from alphabet-compliance/scripts/5420-configure-system-accounts.sh
rename to alphabet-compliance/scripts/5420-system-accounts-secured.sh
diff --git a/alphabet-compliance/scripts/5440-configure-default-user-umask.sh b/alphabet-compliance/scripts/5440-default-user-umask-027-or-more-restrictive-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/5440-configure-default-user-umask.sh
rename to alphabet-compliance/scripts/5440-default-user-umask-027-or-more-restrictive-cos.sh
diff --git a/alphabet-compliance/scripts/5450-configure-default-shell-timeout.sh b/alphabet-compliance/scripts/5450-default-user-shell-timeout-900-or-less-cos.sh
similarity index 100%
rename from alphabet-compliance/scripts/5450-configure-default-shell-timeout.sh
rename to alphabet-compliance/scripts/5450-default-user-shell-timeout-900-or-less-cos.sh