diff --git a/BUILD.md b/BUILD.md
index fbff5e0fe..3e4342a70 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -5,7 +5,7 @@ hashcat build documentation
 
 # Author: see docs/credits.txt
 
-# Building hashcat for Linux and MacOS
+# Building hashcat for Linux and macOS
 
 Get a copy of the **hashcat** repository
 
diff --git a/README.md b/README.md
index ccfd6c4f9..f95ff2440 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## *hashcat* ##
 
-**hashcat** is the world's fastest and most advanced password recovery utility, supporting five unique modes of attack for over 200 highly-optimized hashing algorithms. hashcat currently supports CPUs, GPUs, and other hardware accelerators on Linux, Windows, and MacOS, and has facilities to help enable distributed password cracking.
+**hashcat** is the world's fastest and most advanced password recovery utility, supporting five unique modes of attack for over 200 highly-optimized hashing algorithms. hashcat currently supports CPUs, GPUs, and other hardware accelerators on Linux, Windows, and macOS, and has facilities to help enable distributed password cracking.
 
 ### License ###
 
diff --git a/docs/changes.txt b/docs/changes.txt
index 48ff27978..c919cd091 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -10,7 +10,7 @@
 - Added option --self-test-disable to disable self-test functionality on startup
 - Added option --wordlist-autohex-disable to disable the automatical conversion of $HEX[] words from the word list
 - Added option --example-hashes to show an example hash for each hash-mode
-- Removed option --weak-hash-check (zero-length password check) to increase startup time, it also causes many Trap 6 error on MacOS
+- Removed option --weak-hash-check (zero-length password check) to increase startup time, it also causes many Trap 6 error on macOS
 
 ##
 ## Algorithms
@@ -63,7 +63,7 @@
 - OpenCL Kernels: Updated default scrypt TMTO to be ideal for latest NVidia and AMD top models
 - OpenCL Kernels: Vectorized tons of slow kernels to improve CPU cracking speed
 - OpenCL Runtime: Updated AMD ROCm driver version check, warn if version < 1.1
-- OpenCL Runtime: Improved detection for AMD and NV devices on MacOS
+- OpenCL Runtime: Improved detection for AMD and NV devices on macOS
 - OpenCL Runtime: Improved performance on Intel MIC devices (Xeon PHI) on runtime level (300MH/s to 2000MH/s)
 - Show cracks: Improved the performance of --show/--left if used together with --username
 - Startup: Add visual indicator of active options when benchmarking
@@ -375,7 +375,7 @@
 - Hardware management: Removed *throttled* message from NVML as this created more confusion than it helped
 - Hash Parser: Improved error detection of invalid hex characters where hex character are expected
 - OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.50 is detected which is known to be broken
-- OpenCL Runtime: Updated hashcat.hctune for Iris Pro GPU on MacOS
+- OpenCL Runtime: Updated hashcat.hctune for Iris Pro GPU on macOS
 - Potfile: In v3.10 already, the default potfile suffix changed but the note about was missing. The "hashcat.pot" became "hashcat.potfile"
 - Potfile: Added old potfile detection, show warning message
 - Returncode: Added dedicated returncode (see docs/status_codes.txt) for shutdowns caused by --runtime and checkpoint keypress
@@ -449,9 +449,9 @@ The CLI (hashcat.bin or hashcat.exe) works as before but from a technical perspe
 - Workaround added for AMDGPU-Pro OpenCL runtime: Failed to compile hash-mode 1800 = sha512crypt
 - Workaround added for NVidia OpenCL runtime: Failed to compile hash-mode 6400 = AIX {ssha256}
 - Workaround added for NVidia OpenCL runtime: Failed to compile hash-mode 6800 = Lastpass + Lastpass sniffed
-- Workaround added for MacOS OpenCL runtime: Failed to compile hash-mode 10420 = PDF 1.1 - 1.3 (Acrobat 2 - 4)
-- Workaround added for MacOS OpenCL runtime: Failed to compile hash-mode 1100 = Domain Cached Credentials (DCC), MS Cache
-- Workaround added for MacOS OpenCL runtime: Failed to compile hash-mode 13800 = Windows 8+ phone PIN/Password
+- Workaround added for macOS OpenCL runtime: Failed to compile hash-mode 10420 = PDF 1.1 - 1.3 (Acrobat 2 - 4)
+- Workaround added for macOS OpenCL runtime: Failed to compile hash-mode 1100 = Domain Cached Credentials (DCC), MS Cache
+- Workaround added for macOS OpenCL runtime: Failed to compile hash-mode 13800 = Windows 8+ phone PIN/Password
 - Workaround added for pocl OpenCL runtime: Failed to compile hash-mode 5800 = Android PIN
 
 ##
@@ -475,7 +475,7 @@ The CLI (hashcat.bin or hashcat.exe) works as before but from a technical perspe
 - Autotune: Do not run any caching rounds in autotune in DEBUG mode if -n and -u are specified
 - Bash completion: Removed some v2.01 leftovers in the bash completion configuration
 - Benchmark: Do not control fan speed in benchmark mode
-- Benchmark: On MacOS, some hash-modes can't compile because of MacOS OpenCL runtime. Skip them and move on to the next
+- Benchmark: On macOS, some hash-modes can't compile because of macOS OpenCL runtime. Skip them and move on to the next
 - Building: Added Makefile target "main_shared", a small how-to-use libhashcat example
 - Building: Added many additional compiler warning flags in Makefile to improve static code error detection
 - Building: Added missing includes for FreeBSD
@@ -484,8 +484,8 @@ The CLI (hashcat.bin or hashcat.exe) works as before but from a technical perspe
 - Building: Defined NOMINMAX macro to prevent definition min and max macros in stdlib header files
 - Building: Enabled ASLR and DEP for Windows builds
 - Building: Fixed almost all errors reported by cppcheck and scan-build
-- Building: On MacOS, move '-framework OpenCL' from CFLAGS to LDFLAGS
-- Building: On MacOS, use clang as default compiler
+- Building: On macOS, move '-framework OpenCL' from CFLAGS to LDFLAGS
+- Building: On macOS, use clang as default compiler
 - Building: Support building on Msys2 environment
 - Building: Use .gitmodules to simplify the OpenCL header dependency handling process
 - Charsets: Added DES_full.charset
@@ -522,7 +522,7 @@ The CLI (hashcat.bin or hashcat.exe) works as before but from a technical perspe
 - Memory management: Fixed some memory leaks on shutdown
 - Memory management: Got rid of all global variables
 - Memory management: Got rid of local_free() and global_free(), no longer required
-- Memory management: Refactored all variables with HCBUFSIZ_LARGE size from stack to heap, MacOS doesn't like that
+- Memory management: Refactored all variables with HCBUFSIZ_LARGE size from stack to heap, macOS doesn't like that
 - OpenCL Headers: Select OpenCL headers tagged for OpenCL 1.2, since we use -cl-std=CL1.2
 - OpenCL Kernels: Added const qualifier to variable declaration of matching global memory objects
 - OpenCL Kernels: Got rid of one global kernel_threads variable
diff --git a/docs/credits.txt b/docs/credits.txt
index f7bea27c2..e8eff3b83 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -18,7 +18,7 @@ Philipp "philsmd" Schmidt <philsmd@hashcat.net> (@philsmd)
 
 Gabriele "matrix" Gristina <matrix@hashcat.net> (@gm4tr1x)
 
-* Apple MacOS port
+* Apple macOS port
 * Hardware monitor initial code base
 * Test suite initial code base
 * Makefiles initial code base
diff --git a/docs/readme.txt b/docs/readme.txt
index 86dd4f8f2..db48fc479 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -16,7 +16,7 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later)
 - World's first and only in-kernel rule engine
 - Free
 - Open-Source (MIT License)
-- Multi-OS (Linux, Windows and MacOS)
+- Multi-OS (Linux, Windows and macOS)
 - Multi-Platform (CPU, GPU, DSP, FPGA, etc., everything that comes with an OpenCL runtime)
 - Multi-Hash (Cracking multiple hashes at the same time)
 - Multi-Devices (Utilizing multiple devices in same system)
@@ -155,13 +155,13 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later)
 - sha512crypt
 - bcrypt
 - scrypt
-- MacOS v10.4
-- MacOS v10.5
-- MacOS v10.6
-- MacOS v10.7
-- MacOS v10.8
-- MacOS v10.9
-- MacOS v10.10
+- macOS v10.4
+- macOS v10.5
+- macOS v10.6
+- macOS v10.7
+- macOS v10.8
+- macOS v10.9
+- macOS v10.10
 - iTunes backup < 10.0
 - iTunes backup >= 10.0
 - AIX {smd5}
diff --git a/src/Makefile b/src/Makefile
index a86272448..9193180bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -89,7 +89,7 @@ SED_IN_PLACE            := -i
 
 ifeq ($(UNAME),Darwin)
 CC                      := clang
-# the sed -i option of MacOS requires a parameter for the backup file (we just use "")
+# the sed -i option of macOS requires a parameter for the backup file (we just use "")
 SED_IN_PLACE            := -i ""
 endif
 
@@ -165,7 +165,7 @@ endif
 
 # default Linux and freebsd thread stack size is 2MB
 # default Windows thread stack size is 1MB
-# default MacOS thread stack size is 512kB
+# default macOS thread stack size is 512kB
 # unfortunately, this option isn't supported by older GCC and clang versions
 
 #CFLAGS                  += -Wstack-usage=524288
diff --git a/src/interface.c b/src/interface.c
index 2d27c159f..c0fa7cc8a 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -408,7 +408,7 @@ static const char HT_06700[] = "AIX {ssha1}";
 static const char HT_06800[] = "LastPass + LastPass sniffed";
 static const char HT_06900[] = "GOST R 34.11-94";
 static const char HT_07000[] = "FortiGate (FortiOS)";
-static const char HT_07100[] = "MacOS v10.8+ (PBKDF2-SHA512)";
+static const char HT_07100[] = "macOS v10.8+ (PBKDF2-SHA512)";
 static const char HT_07200[] = "GRUB 2";
 static const char HT_07300[] = "IPMI2 RAKP HMAC-SHA1";
 static const char HT_07400[] = "sha256crypt $5$, SHA256 (Unix)";
@@ -508,7 +508,7 @@ static const char HT_00101[] = "nsldap, SHA-1(Base64), Netscape LDAP SHA";
 static const char HT_00111[] = "nsldaps, SSHA-1(Base64), Netscape LDAP SSHA";
 static const char HT_00112[] = "Oracle S: Type (Oracle 11+)";
 static const char HT_00121[] = "SMF (Simple Machines Forum) > v1.1";
-static const char HT_00122[] = "MacOS v10.4, MacOS v10.5, MacOS v10.6";
+static const char HT_00122[] = "macOS v10.4, macOS v10.5, MacOS v10.6";
 static const char HT_00124[] = "Django (SHA-1)";
 static const char HT_00125[] = "ArubaOS";
 static const char HT_00131[] = "MSSQL (2000)";
@@ -519,7 +519,7 @@ static const char HT_01411[] = "SSHA-256(Base64), LDAP {SSHA256}";
 static const char HT_01421[] = "hMailServer";
 static const char HT_01441[] = "Episerver 6.x >= .NET 4";
 static const char HT_01711[] = "SSHA-512(Base64), LDAP {SSHA512}";
-static const char HT_01722[] = "MacOS v10.7";
+static const char HT_01722[] = "macOS v10.7";
 static const char HT_01731[] = "MSSQL (2012, 2014)";
 static const char HT_02611[] = "vBulletin < v3.8.5";
 static const char HT_02612[] = "PHPS";
diff --git a/src/opencl.c b/src/opencl.c
index cd827d0d9..f63c32d66 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -4214,7 +4214,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
     #endif
 
     // include check
-    // this test needs to be done manually because of MacOS opencl runtime
+    // this test needs to be done manually because of macOS opencl runtime
     // if there's a problem with permission, its not reporting back and erroring out silently
 
     #define files_cnt 16
@@ -5483,7 +5483,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
     hardware_power_all += device_param->hardware_power;
   }
 
-  // Prevent exit from benchmark mode if all devices are skipped due to unstable hash-modes (MacOS)
+  // Prevent exit from benchmark mode if all devices are skipped due to unstable hash-modes (macOS)
 
   bool has_skipped_temp = false;
 
diff --git a/src/usage.c b/src/usage.c
index e447bed2d..f17f706e6 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -257,9 +257,9 @@ static const char *USAGE_BIG[] =
   "   3200 | bcrypt $2*$, Blowfish (Unix)                     | Operating Systems",
   "   7400 | sha256crypt $5$, SHA256 (Unix)                   | Operating Systems",
   "   1800 | sha512crypt $6$, SHA512 (Unix)                   | Operating Systems",
-  "    122 | MacOS v10.4, MacOS v10.5, MacOS v10.6            | Operating Systems",
-  "   1722 | MacOS v10.7                                      | Operating Systems",
-  "   7100 | MacOS v10.8+ (PBKDF2-SHA512)                     | Operating Systems",
+  "    122 | macOS v10.4, MacOS v10.5, MacOS v10.6            | Operating Systems",
+  "   1722 | macOS v10.7                                      | Operating Systems",
+  "   7100 | macOS v10.8+ (PBKDF2-SHA512)                     | Operating Systems",
   "   6300 | AIX {smd5}                                       | Operating Systems",
   "   6700 | AIX {ssha1}                                      | Operating Systems",
   "   6400 | AIX {ssha256}                                    | Operating Systems",
diff --git a/tools/test.pl b/tools/test.pl
index 431a62525..316b53a8a 100755
--- a/tools/test.pl
+++ b/tools/test.pl
@@ -422,7 +422,7 @@ sub verify
 
       $salt = substr ($decoded, 64);
     }
-    # MacOS (first 8 hex chars is salt)
+    # macOS (first 8 hex chars is salt)
     # ArubaOS (the signature gets added in gen_hash)
     elsif ($mode == 122 || $mode == 1722 || $mode == 125)
     {
@@ -873,7 +873,7 @@ sub verify
       $salt = substr ($decoded, 0, 12);
       $salt = unpack ("H*", $salt);
     }
-    # MacOS 10.* : $something$iter$salt$
+    # macOS 10.* : $something$iter$salt$
     elsif ($mode == 7100)
     {
       my $index1 = index ($line, ":");
diff --git a/tools/test.sh b/tools/test.sh
index ce25934d0..f38af8438 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -2232,7 +2232,7 @@ OPTIONS:
   -o    Select operating system :
         'win'    => Windows operating system (use .exe file extension)
         'linux'  => Linux operating system (use .bin file extension)
-        'macos'  => MacOS operating system (use .app file extension)
+        'macos'  => macOS operating system (use .app file extension)
 
   -c    Disables markov-chains
 
@@ -2608,7 +2608,7 @@ if [ "${PACKAGE}" -eq 1 ]; then
 
   UNAME=$(uname -s)
 
-  # of course MacOS requires us to implement a special case (sed -i "" for the backup file)
+  # of course macOS requires us to implement a special case (sed -i "" for the backup file)
   if [ "${UNAME}" == "Darwin" ] ; then
     SED_IN_PLACE='-i ""'
   fi