diff --git a/README.md b/README.md
index 7c10068..7c12b43 100644
--- a/README.md
+++ b/README.md
@@ -622,7 +622,7 @@ will automatically update the installed packages.
 Prelude makes heavy use of the flyspell-mode package for spell
 checking of various things. The proper operation of flyspell depends
 on the presence of the `aspell` program and an `en` dictionary on your
-system. You can install `aspell` and the dictionary on OS X with
+system. You can install `aspell` and the dictionary on macOS with
 `homebrew` like this:
 
 ```bash
@@ -702,7 +702,7 @@ You can always disable the improved sorting algorithm all together like this:
 ### Windows compatibility
 
 While everything in Prelude should work fine in Windows, I test it only
-with Linux & OS X, so there are Windows related problems from time to
+with GNU/Linux & macOS, so there might be Windows-specific problems from time to
 time. This situation will probably improve over time.
 
 ## Known issues
diff --git a/core/prelude-core.el b/core/prelude-core.el
index 2230d2d..802cc2d 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -156,7 +156,7 @@ With a prefix ARG updates all installed packages."
                             (epl-installed-packages))))
     (message "Update finished. Restart Emacs to complete the process.")))
 
-;;; Emacs in OSX already has fullscreen support
+;;; Emacs in macOS already has fullscreen support
 ;;; Emacs has a similar built-in command in 24.4
 (defun prelude-fullscreen ()
   "Make Emacs window fullscreen.
diff --git a/core/prelude-macos.el b/core/prelude-macos.el
index 958b2f7..2c6f1c7 100644
--- a/core/prelude-macos.el
+++ b/core/prelude-macos.el
@@ -11,7 +11,7 @@
 
 ;;; Commentary:
 
-;; Some OSX specific stuff.
+;; Some macOS specific stuff.
 
 ;;; License:
 
diff --git a/modules/prelude-common-lisp.el b/modules/prelude-common-lisp.el
index c714962..ec63d6f 100644
--- a/modules/prelude-common-lisp.el
+++ b/modules/prelude-common-lisp.el
@@ -56,7 +56,7 @@
 ;; select the default value from slime-lisp-implementations
 (if (and (eq system-type 'darwin)
          (executable-find "ccl"))
-    ;; default to Clozure CL on OS X
+    ;; default to Clozure CL on macOS
     (setq slime-default-lisp 'ccl)
   ;; default to SBCL on Linux and Windows
   (setq slime-default-lisp 'sbcl))
diff --git a/modules/prelude-latex.el b/modules/prelude-latex.el
index 52190d4..11acdce 100644
--- a/modules/prelude-latex.el
+++ b/modules/prelude-latex.el
@@ -62,7 +62,7 @@
 ;; use pdflatex
 (setq TeX-PDF-mode t)
 
-;; sensible defaults for OS X, other OSes should be covered out-of-the-box
+;; sensible defaults for macOS, other OSes should be covered out-of-the-box
 (when (eq system-type 'darwin)
   (setq TeX-view-program-selection
         '((output-dvi "DVI Viewer")