Use new "macOS" naming where appropriate.

Not quite a mass replacement as I've used OS X and Mac OS X where
describing specific older versions and added compatibility methods
for things in the DSL.

29 files changed, 68 insertions, 68 deletions

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 70a23a39c..0fadecaba 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -70,23 +70,23 @@ unset BASH_ENV
 
 HOMEBREW_SYSTEM="$(uname -s)"
 case "$HOMEBREW_SYSTEM" in
-  Darwin) HOMEBREW_OSX="1" ;;
+  Darwin) HOMEBREW_MACOS="1" ;;
   Linux)  HOMEBREW_LINUX="1" ;;
 esac
 
 HOMEBREW_CURL="/usr/bin/curl"
-if [[ -n "$HOMEBREW_OSX" ]]
+if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PROCESSOR="$(uname -p)"
   HOMEBREW_PRODUCT="Homebrew"
   HOMEBREW_SYSTEM="Macintosh"
   # This is i386 even on x86_64 machines
   [[ "$HOMEBREW_PROCESSOR" = "i386" ]] && HOMEBREW_PROCESSOR="Intel"
-  HOMEBREW_OSX_VERSION="$(/usr/bin/sw_vers -productVersion)"
-  HOMEBREW_OS_VERSION="Mac OS X $HOMEBREW_OSX_VERSION"
+  HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)"
+  HOMEBREW_OS_VERSION="macOS $HOMEBREW_MACOS_VERSION"
 
-  printf -v HOMEBREW_OSX_VERSION_NUMERIC "%02d%02d%02d" ${HOMEBREW_OSX_VERSION//./ }
-  if [[ "$HOMEBREW_OSX_VERSION_NUMERIC" -lt "100900" &&
+  printf -v HOMEBREW_MACOS_VERSION_NUMERIC "%02d%02d%02d" ${HOMEBREW_MACOS_VERSION//./ }
+  if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "100900" &&
         -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
   then
     HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
@@ -121,11 +121,11 @@ export HOMEBREW_CURL
 export HOMEBREW_PROCESSOR
 export HOMEBREW_PRODUCT
 export HOMEBREW_OS_VERSION
-export HOMEBREW_OSX_VERSION
+export HOMEBREW_MACOS_VERSION
 export HOMEBREW_USER_AGENT
 export HOMEBREW_USER_AGENT_CURL
 
-if [[ -n "$HOMEBREW_OSX" ]]
+if [[ -n "$HOMEBREW_MACOS" ]]
 then
   XCODE_SELECT_PATH=$('/usr/bin/xcode-select' --print-path 2>/dev/null)
   if [[ "$XCODE_SELECT_PATH" = "/" ]]
@@ -224,7 +224,7 @@ check-run-command-as-root() {
   onoe <<EOS
 Running Homebrew as root is extremely dangerous. As Homebrew does not
 drop privileges on installation you are giving all build scripts full access
-to your system. As a result of the OS X sandbox not handling the root user
+to your system. As a result of the macOS sandbox not handling the root user
 correctly HOMEBREW_NO_SANDBOX has been set so the sandbox will not be used. If
 we have not merged a pull request to add privilege dropping by November 1st
 2016 running Homebrew as root will be disabled. No Homebrew maintainers plan
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 93141ca5b..9c42eda23 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -19,7 +19,7 @@
 #:    bottle.
 #:
 #:    If `--force-bottle` is passed, download a bottle if it exists for the current
-#:    version of OS X, even if it would not be used during installation.
+#:    version of macOS, even if it would not be used during installation.
 
 require "formula"
 
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 99cb75353..b2b3eb7c0 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -34,7 +34,7 @@
 #:
 #     Hidden developer option:
 #     If `--force-bottle` is passed, install from a bottle if it exists
-#    for the current version of OS X, even if custom options are given.
+#    for the current version of macOS, even if custom options are given.
 #
 #:    If `--devel` is passed, and <formula> defines it, install the development version.
 #:
diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index a4e4326f2..c7685855f 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -1,5 +1,5 @@
 #:  * `linkapps` [`--local`] [<formulae>]:
-#:    Find installed formulae that provide `.app`-style OS X apps and symlink them
+#:    Find installed formulae that provide `.app`-style macOS apps and symlink them
 #:    into `/Applications`, allowing for easier access.
 #:
 #:    If no <formulae> are provided, all of them will have their apps symlinked.
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 8f02579c3..b57691893 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -23,7 +23,7 @@ git() {
 }
 
 git_init_if_necessary() {
-  if [[ -n "$HOMEBREW_OSX" ]]
+  if [[ -n "$HOMEBREW_MACOS" ]]
   then
     BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew"
     CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"
diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh
index ca64789bc..8f08e49fb 100644
--- a/Library/Homebrew/cmd/vendor-install.sh
+++ b/Library/Homebrew/cmd/vendor-install.sh
@@ -9,7 +9,7 @@ source "$HOMEBREW_LIBRARY/Homebrew/utils/lock.sh"
 VENDOR_DIR="$HOMEBREW_LIBRARY/Homebrew/vendor"
 
 # Built from https://github.com/Homebrew/homebrew-portable.
-if [[ -n "$HOMEBREW_OSX" ]]
+if [[ -n "$HOMEBREW_MACOS" ]]
 then
   if [[ "$HOMEBREW_PROCESSOR" = "Intel" ]]
   then
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 1a7da8eb9..ab2735adb 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -31,8 +31,8 @@ BOTTLE_ERB = <<-EOS.freeze
     <% end %>
     <% checksums.each do |checksum_type, checksum_values| %>
     <% checksum_values.each do |checksum_value| %>
-    <% checksum, osx = checksum_value.shift %>
-    <%= checksum_type %> "<%= checksum %>" => :<%= osx %>
+    <% checksum, macos = checksum_value.shift %>
+    <%= checksum_type %> "<%= checksum %>" => :<%= macos %>
     <% end %>
     <% end %>
   end
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index bcdde6656..650ff3eab 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -554,7 +554,7 @@ module Homebrew
             Homebrew doesn't provide a libiconv formula, and expects to link against
             the system version in /usr. libiconv in other prefixes can cause
             compile or link failure, especially if compiled with improper
-            architectures. OS X itself never installs anything to /usr/local so
+            architectures. macOS itself never installs anything to /usr/local so
             it was either installed by a user or some other third party software.
 
             tl;dr: delete these files:
@@ -659,7 +659,7 @@ module Homebrew
 
         <<-EOS.undent
           Your Cellar and TEMP directories are on different volumes.
-          OS X won't move relative symlinks across volumes unless the target file already
+          macOS won't move relative symlinks across volumes unless the target file already
           exists. Brews known to be affected by this are Git and Narwhal.
 
           You should set the "HOMEBREW_TEMP" environmental variable to a suitable
@@ -696,7 +696,7 @@ module Homebrew
 
         <<-EOS.undent
           The filesystem on #{case_sensitive_vols.join(",")} appears to be case-sensitive.
-          The default OS X filesystem is case-insensitive. Please report any apparent problems.
+          The default macOS filesystem is case-insensitive. Please report any apparent problems.
         EOS
       end
 
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 70045333a..07658c6e7 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -356,8 +356,8 @@ class BuildError < RuntimeError
     end
 
     require "diagnostic"
-    unsupported_osx = Homebrew::Diagnostic::Checks.new.check_for_unsupported_osx
-    opoo unsupported_osx if unsupported_osx
+    unsupported_macos = Homebrew::Diagnostic::Checks.new.check_for_unsupported_macos
+    opoo unsupported_macos if unsupported_macos
   end
 end
 
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index f8d6c9e1f..15dd3328f 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -3,7 +3,7 @@ module Homebrew
     class Checks
       def development_tools_checks
         %w[
-          check_for_unsupported_osx
+          check_for_unsupported_macos
           check_for_prerelease_xcode
           check_for_bad_install_name_tool
           check_for_installed_developer_tools
@@ -25,7 +25,7 @@ module Homebrew
         end
       end
 
-      def check_for_unsupported_osx
+      def check_for_unsupported_macos
         return if ARGV.homebrew_developer?
 
         who = "We"
@@ -39,7 +39,7 @@ module Homebrew
         end
 
         <<-EOS.undent
-          You are using OS X #{MacOS.version}.
+          You are using macOS #{MacOS.version}.
           #{who} do not provide support for this #{what}.
           You may encounter build failures or other breakages.
           Please create pull-requests instead of filing issues.
@@ -98,7 +98,7 @@ module Homebrew
 
         <<-EOS.undent
           You have Xcode 8 installed without the CLT;
-          this causes certain builds to fail on OS X 10.11.
+          this causes certain builds to fail on OS X El Capitan (10.11).
           Please install the CLT via:
             sudo xcode-select --install
         EOS
@@ -150,7 +150,7 @@ module Homebrew
           You have an outdated version of /usr/bin/install_name_tool installed.
           This will cause binary package installations to fail.
           This can happen if you install osx-gcc-installer or RailsInstaller.
-          To restore it, you must reinstall OS X or restore the binary from
+          To restore it, you must reinstall macOS or restore the binary from
           the OS packages.
         EOS
       end
diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index c369f38e6..acee50ad0 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -40,7 +40,7 @@ class SystemConfig
 
     def dump_verbose_config(f = $stdout)
       dump_generic_verbose_config(f)
-      f.puts "OS X: #{MacOS.full_version}-#{kernel}"
+      f.puts "macOS: #{MacOS.full_version}-#{kernel}"
       f.puts "Xcode: #{xcode ? xcode : "N/A"}"
       f.puts "CLT: #{clt ? clt : "N/A"}"
       f.puts "X11: #{describe_xquartz}"
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 599b49392..f40f54110 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1988,7 +1988,7 @@ class Formula
     # depends_on :fortran # Checks that `gfortran` is available or `FC` is set.
     # depends_on :mpi => :cc # Needs MPI with `cc`
     # depends_on :mpi => [:cc, :cxx, :optional] # Is optional. MPI with `cc` and `cxx`.
-    # depends_on :macos => :lion # Needs at least Mac OS X "Lion" aka. 10.7.
+    # depends_on :macos => :lion # Needs at least OS X Lion (10.7).
     # depends_on :apr # If a formula requires the CLT-provided apr library to exist.
     # depends_on :arch => :intel # If this formula only builds on Intel architecture.
     # depends_on :arch => :x86_64 # If this formula only builds on Intel x86 64-bit.
@@ -2004,7 +2004,7 @@ class Formula
     # depends_on :postgresql if build.without? "sqlite"
     # depends_on :hg # Mercurial (external or brewed) is needed</pre>
     #
-    # <pre># If any Python >= 2.7 < 3.x is okay (either from OS X or brewed):
+    # <pre># If any Python >= 2.7 < 3.x is okay (either from macOS or brewed):
     # depends_on :python</pre>
     # <pre># to depend on Python >= 2.7 but use system Python where possible
     # depends_on :python if MacOS.version <= :snow_leopard</pre>
@@ -2117,8 +2117,8 @@ class Formula
     # add the necessary includes and libs (etc.) during the brewing of that
     # other formula. But generally, keg_only formulae are not in your PATH
     # and not seen by compilers if you build your own software outside of
-    # Homebrew. This way, we don't shadow software provided by OS X.
-    # <pre>keg_only :provided_by_osx</pre>
+    # Homebrew. This way, we don't shadow software provided by macOS.
+    # <pre>keg_only :provided_by_macos</pre>
     # <pre>keg_only "because I want it so"</pre>
     def keg_only(reason, explanation = "")
       @keg_only_reason = KegOnlyReason.new(reason, explanation)
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb
index 83855d131..e4f800364 100644
--- a/Library/Homebrew/formula_support.rb
+++ b/Library/Homebrew/formula_support.rb
@@ -1,7 +1,7 @@
 # Used to track formulae that cannot be installed at the same time
 FormulaConflict = Struct.new(:name, :reason)
 
-# Used to annotate formulae that duplicate OS X provided software
+# Used to annotate formulae that duplicate macOS provided software
 # or cause conflicts when linked in.
 class KegOnlyReason
   def initialize(reason, explanation)
@@ -29,22 +29,22 @@ class KegOnlyReason
   def to_s
     return @explanation unless @explanation.empty?
     case @reason
-    when :provided_by_osx then <<-EOS
-OS X already provides this software and installing another version in
+    when :provided_by_macos, :provided_by_osx then <<-EOS
+macOS already provides this software and installing another version in
 parallel can cause all kinds of trouble.
 EOS
-    when :shadowed_by_osx then <<-EOS
-OS X provides similar software and installing this software in
+    when :shadowed_by_macos, :shadowed_by_osx then <<-EOS
+macOS provides similar software and installing this software in
 parallel can cause all kinds of trouble.
 EOS
     when :provided_pre_mountain_lion then <<-EOS
-OS X already provides this software in versions before Mountain Lion.
+macOS already provides this software in versions before Mountain Lion.
 EOS
     when :provided_pre_mavericks then <<-EOS
-OS X already provides this software in versions before Mavericks.
+macOS already provides this software in versions before Mavericks.
 EOS
     when :provided_pre_el_capitan then <<-EOS
-OS X already provides this software in versions before El Capitan.
+macOS already provides this software in versions before El Capitan.
 EOS
     when :provided_until_xcode43
       "Xcode provides this software prior to version 4.3."
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index d6828e9d0..bb6a15261 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -9,7 +9,7 @@
 #
 # When done, regenerate the man page and its HTML version by running `brew man`.
 %>
-brew(1) -- The missing package manager for OS X
+brew(1) -- The missing package manager for macOS
 ===============================================
 
 ## SYNOPSIS
@@ -20,7 +20,7 @@ brew(1) -- The missing package manager for OS X
 ## DESCRIPTION
 
 Homebrew is the easiest and most flexible way to install the UNIX tools Apple
-didn't include with OS X.
+didn't include with macOS.
 
 ## ESSENTIAL COMMANDS
 
@@ -220,7 +220,7 @@ can take several different forms:
   * `HOMEBREW_TEMP`:
     If set, instructs Homebrew to use `HOMEBREW_TEMP` as the temporary directory
     for building packages. This may be needed if your system temp directory and
-    Homebrew Prefix are on different volumes, as OS X has trouble moving
+    Homebrew Prefix are on different volumes, as macOS has trouble moving
     symlinks across volumes when the target does not yet exist.
 
     This issue typically occurs when using FileVault or custom SSD
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 803d8cce3..c6fb9b721 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -24,7 +24,7 @@ module OS
     # This can be compared to numerics, strings, or symbols
     # using the standard Ruby Comparable methods.
     def full_version
-      @full_version ||= Version.new(ENV["HOMEBREW_OSX_VERSION"].chomp)
+      @full_version ||= Version.new(ENV["HOMEBREW_MACOS_VERSION"].chomp)
     end
 
     def prerelease?
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index c03b91f21..f487a6997 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -18,11 +18,11 @@ module OS
         when "10.11" then "7.3.1"
         when "10.12" then "8.0"
         else
-          # Default to newest known version of Xcode for unreleased OSX versions.
+          # Default to newest known version of Xcode for unreleased macOS versions.
           if OS::Mac.prerelease?
             "8.0"
           else
-            raise "OS X '#{MacOS.version}' is invalid"
+            raise "macOS '#{MacOS.version}' is invalid"
           end
         end
       end
diff --git a/Library/Homebrew/requirements/maximum_macos_requirement.rb b/Library/Homebrew/requirements/maximum_macos_requirement.rb
index ad60af063..ceaa5184b 100644
--- a/Library/Homebrew/requirements/maximum_macos_requirement.rb
+++ b/Library/Homebrew/requirements/maximum_macos_requirement.rb
@@ -12,7 +12,7 @@ class MaximumMacOSRequirement < Requirement
 
   def message
     <<-EOS.undent
-      This formula either does not compile or function as expected on OS X
+      This formula either does not compile or function as expected on macOS
       versions newer than #{@version.pretty_name} due to an upstream incompatibility.
     EOS
   end
diff --git a/Library/Homebrew/requirements/minimum_macos_requirement.rb b/Library/Homebrew/requirements/minimum_macos_requirement.rb
index f128a6615..8f82001ea 100644
--- a/Library/Homebrew/requirements/minimum_macos_requirement.rb
+++ b/Library/Homebrew/requirements/minimum_macos_requirement.rb
@@ -11,6 +11,6 @@ class MinimumMacOSRequirement < Requirement
   satisfy(build_env: false) { MacOS.version >= @version }
 
   def message
-    "OS X #{@version.pretty_name} or newer is required."
+    "macOS #{@version.pretty_name} or newer is required."
   end
 end
diff --git a/Library/Homebrew/requirements/python_requirement.rb b/Library/Homebrew/requirements/python_requirement.rb
index 478f6286e..5d79f2a18 100644
--- a/Library/Homebrew/requirements/python_requirement.rb
+++ b/Library/Homebrew/requirements/python_requirement.rb
@@ -10,7 +10,7 @@ class PythonRequirement < Requirement
     next unless python
     version = python_short_version
     next unless version
-    # Always use Python 2.7 for consistency on older versions of OSX.
+    # Always use Python 2.7 for consistency on older versions of Mac OS X.
     version == Version.create("2.7")
   end
 
diff --git a/Library/Homebrew/requirements/unsigned_kext_requirement.rb b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
index f57be6577..2ffc8fda3 100644
--- a/Library/Homebrew/requirements/unsigned_kext_requirement.rb
+++ b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
@@ -8,7 +8,7 @@ class UnsignedKextRequirement < Requirement
   def message
     s = <<-EOS.undent
       Building this formula from source isn't possible due to OS X
-      Yosemite and above's strict unsigned kext ban.
+      Yosemite (10.10) and above's strict unsigned kext ban.
     EOS
     s += super
     s
diff --git a/Library/Homebrew/shims/super/cc b/Library/Homebrew/shims/super/cc
index ea602f1f9..1da8ff173 100755
--- a/Library/Homebrew/shims/super/cc
+++ b/Library/Homebrew/shims/super/cc
@@ -181,7 +181,7 @@ class Cmd
       args << "-Wl,-undefined,dynamic_lookup"
     when /^-isysroot/, /^--sysroot/
       sdk = enum.next
-      # We set the sysroot for OS X SDKs
+      # We set the sysroot for macOS SDKs
       args << "-isysroot" << sdk unless sdk.downcase.include? "osx"
     when "-dylib"
       args << "-Wl,#{arg}"
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index f935d9a13..986dc5354 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -337,18 +337,18 @@ class BottleSpecification
   def checksums
     checksums = {}
     os_versions = collector.keys
-    os_versions.map! do |osx|
+    os_versions.map! do |macos|
       begin
-        MacOS::Version.from_symbol osx
+        MacOS::Version.from_symbol macos
       rescue
         nil
       end
     end.compact!
     os_versions.sort.reverse_each do |os_version|
-      osx = os_version.to_sym
-      checksum = collector[osx]
+      macos = os_version.to_sym
+      checksum = collector[macos]
       checksums[checksum.hash_type] ||= []
-      checksums[checksum.hash_type] << { checksum => osx }
+      checksums[checksum.hash_type] << { checksum => macos }
     end
     checksums
   end
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 830c9ec33..a8b4ee1ff 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -108,7 +108,7 @@ class SystemConfig
     end
 
     def describe_java
-      # java_home doesn't exist on all OS Xs; it might be missing on older versions.
+      # java_home doesn't exist on all macOSs; it might be missing on older versions.
       return "N/A" unless File.executable? "/usr/libexec/java_home"
 
       java_xml = Utils.popen_read("/usr/libexec/java_home", "--xml", "--failfast")
diff --git a/Library/Homebrew/test/test_formula_support.rb b/Library/Homebrew/test/test_formula_support.rb
index 111b509ec..c0a79f950 100644
--- a/Library/Homebrew/test/test_formula_support.rb
+++ b/Library/Homebrew/test/test_formula_support.rb
@@ -8,8 +8,8 @@ class KegOnlyReasonTests < Homebrew::TestCase
   end
 
   def test_to_s_no_explanation
-    r = KegOnlyReason.new :provided_by_osx, ""
-    assert_match(/^OS X already provides/, r.to_s)
+    r = KegOnlyReason.new :provided_by_macos, ""
+    assert_match(/^macOS already provides/, r.to_s)
   end
 end
 
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 43b8689af..11eb6c69d 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -44,8 +44,8 @@ class IntegrationCommandTests < Homebrew::TestCase
     end
   end
 
-  def needs_osx
-    skip "Not on OS X" unless OS.mac?
+  def needs_macos
+    skip "Not on MacOS" unless OS.mac?
   end
 
   def cmd_id_from_args(args)
@@ -729,14 +729,14 @@ class IntegrationCommandTests < Homebrew::TestCase
 
   def test_cask
     needs_test_cmd_taps
-    needs_osx
+    needs_macos
     setup_remote_tap("caskroom/cask")
     cmd("cask", "list")
   end
 
   def test_services
     needs_test_cmd_taps
-    needs_osx
+    needs_macos
     setup_remote_tap("homebrew/services")
     assert_equal "Warning: No services available to control with `brew services`",
       cmd("services", "list")
diff --git a/Library/Homebrew/test/test_os_mac_diagnostic.rb b/Library/Homebrew/test/test_os_mac_diagnostic.rb
index f7d43c4c7..655aa1d46 100644
--- a/Library/Homebrew/test/test_os_mac_diagnostic.rb
+++ b/Library/Homebrew/test/test_os_mac_diagnostic.rb
@@ -19,11 +19,11 @@ class OSMacDiagnosticChecksTest < Homebrew::TestCase
       @checks.check_for_other_package_managers
   end
 
-  def test_check_for_unsupported_osx
+  def test_check_for_unsupported_macos
     ARGV.stubs(:homebrew_developer?).returns false
     OS::Mac.stubs(:prerelease?).returns true
     assert_match "We do not provide support for this pre-release version.",
-      @checks.check_for_unsupported_osx
+      @checks.check_for_unsupported_macos
   end
 
   def test_check_for_unsupported_curl_vars
diff --git a/Library/Homebrew/utils/analytics.sh b/Library/Homebrew/utils/analytics.sh
index b37cd3e8e..0bc58c0be 100644
--- a/Library/Homebrew/utils/analytics.sh
+++ b/Library/Homebrew/utils/analytics.sh
@@ -38,7 +38,7 @@ setup-analytics() {
     if [[ -n "$HOMEBREW_LINUX" ]]
     then
       HOMEBREW_ANALYTICS_USER_UUID="$(tr a-f A-F </proc/sys/kernel/random/uuid)"
-    elif [[ -n "$HOMEBREW_OSX" ]]
+    elif [[ -n "$HOMEBREW_MACOS" ]]
     then
       HOMEBREW_ANALYTICS_USER_UUID="$(/usr/bin/uuidgen)"
     else
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index 9431fa15f..654272363 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -33,7 +33,7 @@ module GitHub
         EOS
       else
         message << <<-EOS.undent
-          The GitHub credentials in the OS X keychain may be invalid.
+          The GitHub credentials in the macOS keychain may be invalid.
           Clear them with:
             printf "protocol=https\\nhost=github.com\\n" | git credential-osxkeychain erase
           Or create a personal access token:
@@ -103,7 +103,7 @@ module GitHub
         case GitHub.api_credentials_type
         when :keychain
           onoe <<-EOS.undent
-            Your OS X keychain GitHub credentials do not have sufficient scope!
+            Your macOS keychain GitHub credentials do not have sufficient scope!
             Scopes they have: #{credentials_scopes}
             Create a personal access token: https://github.com/settings/tokens
             and then set HOMEBREW_GITHUB_API_TOKEN as the authentication method instead.
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh
index 81bc16835..6945c068b 100644
--- a/Library/Homebrew/utils/ruby.sh
+++ b/Library/Homebrew/utils/ruby.sh
@@ -27,7 +27,7 @@ setup-ruby-path() {
         fi
       fi
     else
-      if [[ -n "$HOMEBREW_OSX" ]]
+      if [[ -n "$HOMEBREW_MACOS" ]]
       then
         HOMEBREW_RUBY_PATH="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby"
       else