diff --git a/GenerateDocs.ps1 b/GenerateDocs.ps1
index 406251f20..a8eca1f31 100644
--- a/GenerateDocs.ps1
+++ b/GenerateDocs.ps1
@@ -498,7 +498,7 @@ The following are more advanced settings:
  * ChocolateyPackageParameters - Parameters to use with packaging, not the same as install arguments (which are passed directly to the native installer). Based on `--package-parameters`. (0.9.8.22+)
  * CHOCOLATEY_VERSION - The version of Choco you normally see. Use if you are 'lighting' things up based on choco version. (0.9.9+) - Otherwise take a dependency on the specific version you need.
  * ChocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+) - Automatically handled in built in Choco functions.
- * OS_PLATFORM - Like Windows, OSX, Linux. (0.9.9+)
+ * OS_PLATFORM - Like Windows, macOS, Linux. (0.9.9+)
  * OS_VERSION - The version of OS, like 6.1 something something for Windows. (0.9.9+)
  * OS_NAME - The reported name of the OS. (0.9.9+)
  * IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)
diff --git a/README.md b/README.md
index f416769a1..aa396f4ee 100644
--- a/README.md
+++ b/README.md
@@ -173,7 +173,7 @@ sudo apt-get install mono-devel -y
  * Consider adding the following to your `~/.profile` (or other relevant dot source file):
 
 ```sh
-# mono
+# Mono
 # http://www.michaelruck.de/2010/03/solving-pkg-config-and-mono-35-profile.html
 # https://cloudgen.wordpress.com/2013/03/06/configure-nant-to-run-under-mono-3-06-beta-for-mac-osx/
 export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH
diff --git a/build.sh b/build.sh
index 0b1b6af38..dfdc92e93 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 
 ##########################################################################
-# This is the Cake bootstrapper script for Linux and OS X.
+# This is the Cake bootstrapper script for Linux and macOS.
 # This file was downloaded from https://github.com/cake-build/resources
 # Feel free to change this file to fit your needs.
 ##########################################################################
@@ -23,7 +23,7 @@ export CAKE_PATHS_TOOLS=$TOOLS_DIR
 export CAKE_PATHS_ADDINS=$ADDINS_DIR
 export CAKE_PATHS_MODULES=$MODULES_DIR
 
-# Define md5sum or md5 depending on Linux/OSX
+# Define md5sum or md5 depending on Linux / macOS
 MD5_EXE=
 if [[ "$(uname -s)" == "Darwin" ]]; then
     MD5_EXE="md5 -r"
diff --git a/docker/Dockerfile.windows b/docker/Dockerfile.windows
index fece6acc4..df9d6fbf8 100644
--- a/docker/Dockerfile.windows
+++ b/docker/Dockerfile.windows
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.source="https://github.com/chocolatey/choco"
 LABEL org.opencontainers.image.vendor="Chocolatey Software, Inc"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.title="Chocolatey"
-LABEL org.opencontainers.image.description="Chocolatey Client running on .Net"
+LABEL org.opencontainers.image.description="Chocolatey Client running on .NET"
 LABEL org.opencontainers.image.authors="https://chocolatey.org/support"
 LABEL org.opencontainers.image.base.name="mcr.microsoft.com/windows/servercore:${tagversion}"
 
diff --git a/docker/README.md b/docker/README.md
index 90d78b9bf..bf90ef592 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 Building Docker Image
 =====================
 
-This directory contains the necessary files for building a Docker Images. There is a Windows based image which runs choco on .Net and a Linux based image that builds and runs choco with mono.
+This directory contains the necessary files for building a Docker Images. There is a Windows based image which runs choco on .NET and a Linux based image that builds and runs choco with Mono.
 
 To build the Windows image yourself, follow these steps:
 
diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
index 8922ac353..00e3baa48 100644
--- a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
+++ b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs
@@ -93,7 +93,7 @@ Chocolatey makes a number of environment variables available (You can access any
  * ChocolateyPackageParameters - Parameters to use with packaging, not the same as install arguments (which are passed directly to the native installer). Based on `--package-parameters`. (0.9.8.22+)
  * CHOCOLATEY_VERSION - The version of Choco you normally see. Use if you are 'lighting' things up based on choco version. (0.9.9+) - Otherwise take a dependency on the specific version you need.
  * ChocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+) - Automatically handled in built in Choco functions.
- * OS_PLATFORM - Like Windows, OSX, Linux. (0.9.9+)
+ * OS_PLATFORM - Like Windows, macOS, Linux. (0.9.9+)
  * OS_VERSION - The version of OS, like 6.1 something something for Windows. (0.9.9+)
  * OS_NAME - The reported name of the OS. (0.9.9+)
  * USER_NAME = The user name (0.10.6+)
diff --git a/src/chocolatey/infrastructure/filesystem/DotNetFileSystem.cs b/src/chocolatey/infrastructure/filesystem/DotNetFileSystem.cs
index 39bc7b17f..9824290db 100644
--- a/src/chocolatey/infrastructure/filesystem/DotNetFileSystem.cs
+++ b/src/chocolatey/infrastructure/filesystem/DotNetFileSystem.cs
@@ -650,7 +650,7 @@ public void move_directory(string directoryPath, string newDirectoryPath)
         {
             if (string.IsNullOrWhiteSpace(directoryPath) || string.IsNullOrWhiteSpace(newDirectoryPath)) throw new ApplicationException("You must provide a directory to move from or to.");
 
-            //Linux/MacOS do not have a SystemDrive environment variable, instead, everything is under "/"
+            // Linux / macOS do not have a SystemDrive environment variable, instead, everything is under "/"
             var systemDrive = Platform.get_platform() == PlatformType.Windows ? Environment.GetEnvironmentVariable("SystemDrive") : "/";
             if (combine_paths(directoryPath, "").is_equal_to(combine_paths(systemDrive, ""))) throw new ApplicationException("Cannot move or delete the root of the system drive");
 
@@ -745,7 +745,7 @@ public void delete_directory(string directoryPath, bool recursive, bool override
         {
             if (string.IsNullOrWhiteSpace(directoryPath)) throw new ApplicationException("You must provide a directory to delete.");
 
-            //Linux / MacOS do not have a SystemDrive environment variable, instead, everything is under "/"
+            // Linux / macOS do not have a SystemDrive environment variable, instead, everything is under "/"
             var systemDrive = Platform.get_platform() == PlatformType.Windows ? Environment.GetEnvironmentVariable("SystemDrive") : "/";
             if (combine_paths(directoryPath, "").is_equal_to(combine_paths(systemDrive, ""))) throw new ApplicationException("Cannot move or delete the root of the system drive");
 
diff --git a/src/chocolatey/infrastructure/platforms/Platform.cs b/src/chocolatey/infrastructure/platforms/Platform.cs
index 029d47875..5c9d00316 100644
--- a/src/chocolatey/infrastructure/platforms/Platform.cs
+++ b/src/chocolatey/infrastructure/platforms/Platform.cs
@@ -59,7 +59,7 @@ public static PlatformType get_platform()
                     return PlatformType.Mac;
 
                 case PlatformID.Unix:
-                    // Well, there are chances MacOSX is reported as Unix instead of MacOSX.
+                    // Well, there are chances macOS is reported as Unix instead of macOS (MacOSX).
                     // Instead of platform check, we'll do a feature checks (Mac specific root folders)
                     if (file_system.directory_exists("/Applications")
                         & file_system.directory_exists("/System")
@@ -85,7 +85,7 @@ public static string get_name()
                 case PlatformType.Linux:
                     return "Linux";
                 case PlatformType.Mac:
-                    return "OS X";
+                    return "macOS";
                 case PlatformType.Windows:
                     return get_windows_name(get_version());
                 default:
diff --git a/tests/packages/msi.template/templates/ReadMe.md b/tests/packages/msi.template/templates/ReadMe.md
index 7b96a3af7..49f29587e 100644
--- a/tests/packages/msi.template/templates/ReadMe.md
+++ b/tests/packages/msi.template/templates/ReadMe.md
@@ -74,7 +74,7 @@ The following are more advanced settings:
     - Otherwise take a dependency on the specific version you need. 
  * chocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+)
     - Automatically handled in built in Choco functions. 
- * OS_PLATFORM = Like Windows, OSX, Linux. (0.9.9+)
+ * OS_PLATFORM = Like Windows, macOS, Linux. (0.9.9+)
  * OS_VERSION = The version of OS, like 6.1 something something for Windows. (0.9.9+)
  * OS_NAME = The reported name of the OS. (0.9.9+)
  * IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)
diff --git a/tests/packages/zip.template/templates/ReadMe.md b/tests/packages/zip.template/templates/ReadMe.md
index 7b96a3af7..49f29587e 100644
--- a/tests/packages/zip.template/templates/ReadMe.md
+++ b/tests/packages/zip.template/templates/ReadMe.md
@@ -74,7 +74,7 @@ The following are more advanced settings:
     - Otherwise take a dependency on the specific version you need. 
  * chocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+)
     - Automatically handled in built in Choco functions. 
- * OS_PLATFORM = Like Windows, OSX, Linux. (0.9.9+)
+ * OS_PLATFORM = Like Windows, macOS, Linux. (0.9.9+)
  * OS_VERSION = The version of OS, like 6.1 something something for Windows. (0.9.9+)
  * OS_NAME = The reported name of the OS. (0.9.9+)
  * IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)