diff --git a/docs/changes.txt b/docs/changes.txt
index 30f555b89..9dcf7f601 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -4,9 +4,9 @@
 ## Features
 ##
 
-- Added support to use --stdout in brain-client mode
+- Added support for using --stdout in brain-client mode
 - Added new option --stdin-timeout-abort, to set how long hashcat should wait for stdin input before aborting
-- Added new option --kernel-threads to manually override the automatically calculated number of threads
+- Added new option --kernel-threads to manually override the automatically-calculated number of threads
 
 ##
 ## Algorithms
@@ -22,40 +22,40 @@
 - Added hash-mode 13772 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1024 bit)
 - Added hash-mode 13773 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1536 bit)
 - Added hash-mode 18200 (Kerberos 5 AS-REP etype 23)
-- Added hash-mode 18300 (Apple File System)
+- Added hash-mode 18300 (Apple File System (APFS))
 
 ##
 ## Improvements
 ##
 
-- xxHash: Added support for using system-wide installation
+- xxHash: Added support for using the version provided by the OS/distribution
 
 ##
 ## Bugs
 ##
 
 - Fixed automated calculation of brain-session when not using all hashes in the hashlist
-- Fixed calculation of brain-attack if a given wordlist has the size zero
+- Fixed calculation of brain-attack if a given wordlist has zero size
 - Fixed checking the length of the last token in a hash if it was given the attribute TOKEN_ATTR_FIXED_LENGTH
 - Fixed endianness and invalid separator character in outfile format for hash-mode 16801 (WPA-PMKID-PMK)
-- Fixed ignoring --brain-client-features configuration when brain-server has attack positions information from a previous run
-- Fixed invalid warnings about throttling in case --hwmon-disable was used
+- Fixed ignoring --brain-client-features configuration when brain server has attack-position information from a previous run
+- Fixed invalid warnings about throttling when --hwmon-disable was used
 - Fixed missing call to WSACleanup() to cleanly shutdown windows sockets system
 - Fixed missing call to WSAStartup() and client indexing in order to start the brain server on Windows
-- Fixed out-of-bounds write in short-term memory of the brain-server
-- Fixed status output of progress value in case -S and -l used in combination
-- Fixed output of --speed-only and --progress-only in case a fast hash is used in combination with --slow-candidates
+- Fixed out-of-bounds write in short-term memory of the brain server
+- Fixed status output of progress value when -S and -l are used in combination
+- Fixed output of --speed-only and --progress-only when fast hashes are used in combination with --slow-candidates
 
 ##
 ## Technical
 ##
 
 - Brain: Set --brain-client-features default from 3 to 2
-- Depencies: Added xxHash and OpenCL-Headers to deps/ in order to allow building hashcat from GitHub source release package
-- Depencies: Removed gitmodules xxHash and OpenCL-Headers
+- Dependencies: Added xxHash and OpenCL-Headers to deps/ in order to allow building hashcat from GitHub source release package
+- Dependencies: Removed gitmodules xxHash and OpenCL-Headers
 - Hardware Monitor: Renamed --gpu-temp-abort to --hwmon-temp-abort
 - Hardware Monitor: Renamed --gpu-temp-disable to --hwmon-disable
-- Memory: Limit maximum host memory to allocate depending on bitness
+- Memory: Limit maximum host memory allocation depending on bitness
 - Memory: Reduced default maximum bitmap size from 24 to 18 and give a notice to use --bitmap-max to restore
 - Startup: Show OpenCL runtime initialization message (per device)
 - Tests: Added hash-mode 11700 (Streebog-256)
diff --git a/docs/readme.txt b/docs/readme.txt
index c58b23855..f48b4cfd0 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -234,7 +234,7 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later)
 - VeraCrypt
 - LUKS
 - FileVault 2
-- Apple File System
+- Apple File System (APFS)
 - MS Office <= 2003
 - MS Office 2007
 - MS Office 2010
diff --git a/src/interface.c b/src/interface.c
index 116ce5766..55c8b1cbd 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -559,7 +559,7 @@ static const char *HT_17900 = "Keccak-384";
 static const char *HT_18000 = "Keccak-512";
 static const char *HT_18100 = "TOTP (HMAC-SHA1)";
 static const char *HT_18200 = "Kerberos 5 AS-REP etype 23";
-static const char *HT_18300 = "Apple File System";
+static const char *HT_18300 = "Apple File System (APFS)";
 static const char *HT_99999 = "Plaintext";
 
 static const char *HT_00011 = "Joomla < 2.5.18";
diff --git a/src/usage.c b/src/usage.c
index 8d9216ff9..9fcfe177a 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -367,7 +367,7 @@ static const char *const USAGE_BIG[] =
   "      Y | 3 = XTS 1536 bit all                             | Full-Disk Encryption (FDE)",
   "  14600 | LUKS                                             | Full-Disk Encryption (FDE)",
   "  16700 | FileVault 2                                      | Full-Disk Encryption (FDE)",
-  "  18300 | Apple File System                                | Full-Disk Encryption (FDE)",
+  "  18300 | Apple File System (APFS)                         | Full-Disk Encryption (FDE)",
   "   9700 | MS Office <= 2003 $0/$1, MD5 + RC4               | Documents",
   "   9710 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #1  | Documents",
   "   9720 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #2  | Documents",