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.

2 files changed, 3 insertions, 3 deletions

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