ICE-7483 - Rename OS X to macOS

45 files changed, 111 insertions, 111 deletions

diff --git a/.gitignore b/.gitignore
index 8e7ab5739f1..494745584a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,7 +67,7 @@ cpp/test/IceBox/configuration/build.txt
 /cpp/test/*/*/build.txt
 /csharp/test/*/*/build.txt
 
-# OS X Keychain
+# macOS Keychain
 *.keychain
 .fl????????
 
diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index a788535a79a..cd3d0f273a2 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -265,7 +265,7 @@ noted.
   standard Ice installation.
 
 - Improved the way the build system locates the Python framework on
-  Mac OS X.
+  macOS.
 
 ## Ruby Changes
 
@@ -741,7 +741,7 @@ noted.
 
 - The thread stack size specified with the `IceUtil::Thread::start()`
   method parameter is now adjusted to `PTHREAD_STACK_MIN` if it's
-  inferior to it. On Mac OS X, it's also adjusted to the next closest
+  inferior to it. On macOS, it's also adjusted to the next closest
   multiple of the page size (4KB).
 
 - Added a new overloading of the Ice::createInputStream method:
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index 17819a76aeb..07fa7136de9 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -148,7 +148,7 @@ class Compact(1)
 
 - The Slice compilers now define the `ICE_VERSION` preprocessor macro so that you can use the Ice version to conditionally compile your Slice definitions.
 
-- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and OS X).
+- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and macOS).
 IceGrid now enables active connection management for its object adapters to allow client connections to be closed automatically when inactive.
 
 - Improved `Ice.Trace.Network` tracing for transport acceptors. The tracing now shows when the object adapter starts listening for incoming connections and when it starts accepting them.
@@ -221,7 +221,7 @@ struct MyStruct {
 
 - Fixed a bug that could cause an assertion failure when flushing batch requests.
 
-- Added support for clang compiler on OS X.
+- Added support for clang compiler on macOS.
 
 - Fixed issue where a connection to a remote address would always fail with an assertion on Windows 8.
 
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index 7e49353d455..7af14a74682 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -83,7 +83,7 @@ These are the changes since Ice 3.6.4.
 with a element of type Object* items where unmarshal in reverse order.
 
 - Fixed a bug where metadata was not correctly ignored and can result in bogus
-code being generated if applying invalid metadata directives. 
+code being generated if applying invalid metadata directives.
 
 # Changes in Ice 3.6.3
 
@@ -193,7 +193,7 @@ These are the changes since Ice 3.6.1.
 - Fixed potential deadlock that could occur when using collocation optimization
   and serialized server thread pools.
 
-- Fixed IceSSL bug that would only show up with WSS servers running on OS X
+- Fixed IceSSL bug that would only show up with WSS servers running on macOS
   and Linux. The WSS server could stop reading requests if the client sent
   multiple requests within the same SSL record.
 
@@ -211,7 +211,7 @@ These are the changes since Ice 3.6.1.
 - Fixed an IceGridGUI bug where metrics attributes for Glacier2 and IceStorm
   were not displayed.
 
-- Fixed an IceGridGUI bug where the GUI started minimized in OS X.
+- Fixed an IceGridGUI bug where the GUI started minimized in macOS.
 
 ## Python Changes
 
@@ -294,7 +294,7 @@ These are the changes since Ice 3.6.0.
 
 ## PHP Changes
 
-- Update PHP builds for Linux and OS X to use php-config from PATH. It is no
+- Update PHP builds for Linux and macOS to use php-config from PATH. It is no
   longer necessary to set PHP_HOME.
 
 # Changes in Ice 3.6.0
@@ -359,7 +359,7 @@ These are the changes since Ice 3.5.1.
   member should always be `true` since servers always reject invalid client
   certificates.
 
-- The Ice distribution now supports the Objective-C mapping on OS X.
+- The Ice distribution now supports the Objective-C mapping on macOS.
 
 - The Glacier2 `SessionHelper` class now creates the callback object adapter
   automatically unless the application calls
@@ -663,11 +663,11 @@ These are the changes since Ice 3.5.1.
 
 - Significant changes to the IceSSL plug-in:
 
-    - Now uses the native SecureTransport API on OS X
+    - Now uses the native SecureTransport API on macOS
     - Now uses the native SChannel API on Windows
     - OpenSSL is only used in IceSSL on Linux
 
-- Added support for the `IceSSL.FindCert` property on Windows and OS X.
+- Added support for the `IceSSL.FindCert` property on Windows and macOS.
 
 - Added the new metadata tag `cpp:view-type:Type`, where `Type` is a type that
   can safely provide a "view" into the Ice unmarshaling buffer and thereby avoid
diff --git a/README.md b/README.md
index 11e530ae2d7..7e4c2390bf3 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Ice runs on a wide range of platforms:
 - iOS ([Ice Touch](https://github.com/zeroc-ice/icetouch))
 - Linux
 - Node.js
-- OS X
+- macOS
 - Web Browser
 - Windows
 - WinRT
diff --git a/cpp/BuildInstructionsOSX.md b/cpp/BuildInstructionsOSX.md
index ed72d820497..587c6463511 100644
--- a/cpp/BuildInstructionsOSX.md
+++ b/cpp/BuildInstructionsOSX.md
@@ -1,4 +1,4 @@
-# Building Ice for C++ on OS X
+# Building Ice for C++ on macOS
 
 This file describes the Ice source distribution, including information about
 compiler requirements, third-party dependencies, and instructions for building
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index d4eea4c3abc..633b5195be6 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -22,7 +22,7 @@ prefix			?= /opt/Ice-$(VERSION)
 #
 # The "root directory" for runpath embedded in executables. Can be set
 # to change the runpath added to Ice executables. The default is
-# platform dependent (Linux only, on OS X the embedded runpath is
+# platform dependent (Linux only, on macOS the embedded runpath is
 # always @loader_path/../lib).
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
@@ -36,7 +36,7 @@ create_runpath_symlink  ?= no
 
 #
 # Define embedded_runpath as no if you don't want any RPATH added to
-# the executables (Linux only, on OS X we always add a runpath).
+# the executables (Linux only, on macOS we always add a runpath).
 #
 embedded_runpath 	?= yes
 
@@ -50,14 +50,14 @@ new_dtags 		?= no
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
 # default is platform-dependent. This property has no effect on
-# OS X. On OS X, use CXXARCHFLAGS bellow to establish the build
+# macOS. On macOS, use CXXARCHFLAGS bellow to establish the build
 # architectures.
 #
 #LP64			?= yes
 
 #
 # The build architectures for gcc/llvm based builds. The format of
-# these build flags are OS dependent. For example, under OS X to
+# these build flags are OS dependent. For example, under macOS to
 # build binaries which support both i386 and x86_64 you would use
 # "-arch i386 -arch x86_64".  The default is OS version dependent. Be
 # aware that this value may conflict with the setting of LP64 above.
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index ec8a1c225f2..8440076ca0b 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -40,7 +40,7 @@ else
 endif
 
 #
-# On OS X, always build with C++11 support enabled unless we
+# On macOS, always build with C++11 support enabled unless we
 # explicitly set it to no (possibly to test binary compatibility).
 #
 ifneq ($(CPP11), no)
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index acbcbf4d75d..bb9d162d8c7 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -26,7 +26,7 @@ using namespace std;
 IceUtil::Shared* IceInternal::upCast(DynamicLibrary* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(DynamicLibraryList* p) { return p; }
 
-IceInternal::DynamicLibrary::DynamicLibrary() : 
+IceInternal::DynamicLibrary::DynamicLibrary() :
     _hnd(0)
 {
 }
@@ -177,7 +177,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 
 #ifdef __APPLE__
     //
-    // On OS X fallback to .so and .bundle extensions, if the default
+    // On macOS fallback to .so and .bundle extensions, if the default
     // .dylib fails.
     //
     if(!load(lib + ".dylib"))
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 6ea1e542ac6..a903f6b26c9 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -933,7 +933,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol
 
     // In theory, getaddrinfo should only return EAI_NONAME if
     // AI_NUMERICHOST is specified and the host name is not a IP
-    // address. However on some platforms (e.g. OS X 10.4.x)
+    // address. However on some platforms (e.g. macOS 10.4.x)
     // EAI_NODATA is also returned so we also check for it.
 #  ifdef EAI_NODATA
     if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA))
@@ -1238,10 +1238,10 @@ IceInternal::closeSocket(SOCKET fd)
     WSASetLastError(error);
 #else
     int error = errno;
-    
+
 #  if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     //
-    // FreeBSD returns ECONNRESET if the underlying object was 
+    // FreeBSD returns ECONNRESET if the underlying object was
     // a stream socket that was shut down by the peer before all
     // pending data was delivered.
     //
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index ae88b084401..6e5a5c0906c 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -929,7 +929,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
 
     //
     // NOTE: setting the multicast interface before performing the
-    // connect is important for some OS such as OS X.
+    // connect is important for some OS such as macOS.
     //
     if(isMulticast(_addr))
     {
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index ec547f8f796..363ccbfe98a 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -36,7 +36,7 @@
 
 #include <iterator>
 
-// Ignore OS X OpenSSL deprecation warnings
+// Ignore macOS OpenSSL deprecation warnings
 #ifdef __APPLE__
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index c6d78809827..1404da9f36e 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -136,7 +136,7 @@ checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, cons
     }
     default:
     // case kSecTrustResultInvalid:
-    // case kSecTrustResultConfirm: // Used in old OS X versions
+    // case kSecTrustResultConfirm: // Used in old macOS versions
     // case kSecTrustResultDeny:
     // case kSecTrustResultRecoverableTrustFailure:
     // case kSecTrustResultFatalTrustFailure:
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp
index 66670598ea5..0aafa7416f8 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/IceUtil/CountDownLatch.cpp
@@ -34,12 +34,12 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
     }
-    
+
     rc = pthread_cond_init(&_cond, 0);
     if(rc != 0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
-    }   
+    }
 #endif
 }
 
@@ -60,7 +60,7 @@ IceUtilInternal::CountDownLatch::~CountDownLatch()
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::await() const
 {
 #ifdef _WIN32
@@ -72,7 +72,7 @@ IceUtilInternal::CountDownLatch::await() const
         DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);
 #   endif
         assert(rc == WAIT_OBJECT_0 || rc == WAIT_FAILED);
-        
+
         if(rc == WAIT_FAILED)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -90,11 +90,11 @@ IceUtilInternal::CountDownLatch::await() const
         }
     }
     unlock();
-    
+
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::countDown()
 {
 #ifdef _WIN32
@@ -115,7 +115,7 @@ IceUtilInternal::CountDownLatch::countDown()
     }
 #if defined(__APPLE__)
     //
-    // On OS X we do the broadcast with the mutex held. This seems to
+    // On macOS we do the broadcast with the mutex held. This seems to
     // be necessary to prevent the broadcast call to hang (spinning in
     // an infinite loop).
     //
@@ -129,10 +129,10 @@ IceUtilInternal::CountDownLatch::countDown()
         }
     }
     unlock();
-    
+
 #else
     unlock();
-    
+
     if(broadcast)
     {
         int rc = pthread_cond_broadcast(&_cond);
@@ -146,7 +146,7 @@ IceUtilInternal::CountDownLatch::countDown()
 #endif
 }
 
-int 
+int
 IceUtilInternal::CountDownLatch::getCount() const
 {
 #ifdef _WIN32
diff --git a/cpp/test/Ice/logger/run.py b/cpp/test/Ice/logger/run.py
index 1b5fd09f61c..8d75b292bd6 100755
--- a/cpp/test/Ice/logger/run.py
+++ b/cpp/test/Ice/logger/run.py
@@ -44,7 +44,7 @@ print("ok")
 sys.stdout.write("testing logger UTF8 output with ISO-8859-15 narrow string converter... ")
 #
 # In Windows expected output is UTF8, because the console output code page is set to UTF-8
-# in Linux and OS X, the expected output is ISO-8859-15 because that is the narrow string
+# in Linux and macOS, the expected output is ISO-8859-15 because that is the narrow string
 # encoding used by the application.
 #
 if TestUtil.isWin32():
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index 72ad7b2e47a..062e009bc5f 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -88,7 +88,7 @@ allTests(const CommunicatorPtr& communicator)
         }
 
         // If the 3 datagrams were not received within the 2 seconds, we try again to
-        // receive 3 new datagrams using a new object. We give up after 5 retries. 
+        // receive 3 new datagrams using a new object. We give up after 5 retries.
         replyI = new PingReplyI;
         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
     }
@@ -176,7 +176,7 @@ allTests(const CommunicatorPtr& communicator)
     }
 #endif
 
-    cout << "testing udp bi-dir connection... " << flush;    
+    cout << "testing udp bi-dir connection... " << flush;
     obj->ice_getConnection()->setAdapter(adapter);
     objMcast->ice_getConnection()->setAdapter(adapter);
     nRetry = 5;
@@ -193,7 +193,7 @@ allTests(const CommunicatorPtr& communicator)
         }
 
         // If the 3 datagrams were not received within the 2 seconds, we try again to
-        // receive 3 new datagrams using a new object. We give up after 5 retries. 
+        // receive 3 new datagrams using a new object. We give up after 5 retries.
         replyI = new PingReplyI;
         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
     }
@@ -202,11 +202,11 @@ allTests(const CommunicatorPtr& communicator)
 
     //
     // Sending the replies back on the multicast UDP connection doesn't work for most
-    // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+    // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
     // Windows...). For Windows, see UdpTransceiver constructor for the details. So
     // we don't run this test.
-    // 
-//     cout << "testing udp bi-dir connection... " << flush;    
+    //
+//     cout << "testing udp bi-dir connection... " << flush;
 //     nRetry = 5;
 //     while(nRetry-- > 0)
 //     {
@@ -216,7 +216,7 @@ allTests(const CommunicatorPtr& communicator)
 //         if(ret)
 //         {
 //             break; // Success
-//         }        
+//         }
 //         replyI = new PingReplyI;
 //         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
 //     }
diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index 265c4cf9c83..b790eba8f3a 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -154,7 +154,7 @@ for (ca, alias, path, args) in savecerts:
         cert.save(path + ".p12", **args)
 
 #
-# Create DH parameters to use with OS X Secure Transport.
+# Create DH parameters to use with macOS Secure Transport.
 #
 if clean or not os.path.exists("dh_params512.der"):
     ca1.run("openssl", "dhparam", 512, outform="DER", out="dh_params512.der")
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 7fc424230c9..c9afd2da567 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -1449,7 +1449,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
         // }
 #else
         //
-        // In OS X we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols
+        // In macOS we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols
         // instead we use IceSSL.ProtocolVersionMax IceSSL.ProtocolVersionMin to set the maximun and minimum
         // enabled protocol versions. See the test bellow.
         //
@@ -1573,7 +1573,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
             Test::ServerPrx server = fact->createServer(d);
             try
             {
-                // OS X 10.11 versions prior to 10.11.2 will throw an exception as SSLv3 is totally disabled.
+                // macOS 10.11 versions prior to 10.11.2 will throw an exception as SSLv3 is totally disabled.
                 server->ice_ping();
             }
             catch(const LocalException&)
@@ -1850,7 +1850,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
         {
 #  ifndef ICE_USE_SECURE_TRANSPORT
             //
-            // OS X 10.10 bug the handshake fails attempting client auth
+            // macOS 10.10 bug the handshake fails attempting client auth
             // with anon cipher.
             //
             cerr << ex << endl;
diff --git a/csharp/src/Ice/BasicStream.cs b/csharp/src/Ice/BasicStream.cs
index 9769b69d4c2..d547eab2096 100644
--- a/csharp/src/Ice/BasicStream.cs
+++ b/csharp/src/Ice/BasicStream.cs
@@ -649,7 +649,7 @@ namespace IceInternal
             try
             {
                 //
-                // COMPILERFIX: for some reasons _buf.get() doesn't work here on OS X with Mono;
+                // COMPILERFIX: for some reasons _buf.get() doesn't work here on macOS with Mono;
                 //
                 //byte b = _buf.b.get();
                 byte b = readByte();
diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs
index 1201366b648..4c29395a2c1 100644
--- a/csharp/src/Ice/Network.cs
+++ b/csharp/src/Ice/Network.cs
@@ -198,7 +198,7 @@ namespace IceInternal
 
         public static bool notConnected(SocketException ex)
         {
-            // BUGFIX: SocketError.InvalidArgument because shutdown() under OS X returns EINVAL
+            // BUGFIX: SocketError.InvalidArgument because shutdown() under macOS returns EINVAL
             // if the server side is gone.
             // BUGFIX: shutdown() under Vista might return SocketError.ConnectionReset
             SocketError error = socketErrorCode(ex);
diff --git a/csharp/test/Ice/udp/AllTests.cs b/csharp/test/Ice/udp/AllTests.cs
index 09e5c63ca90..e7006134205 100644
--- a/csharp/test/Ice/udp/AllTests.cs
+++ b/csharp/test/Ice/udp/AllTests.cs
@@ -122,7 +122,7 @@ public class AllTests
                 //
                 // The server's Ice.UDP.RcvSize property is set to 16384, which means that DatagramLimitException
                 // will be throw when try to send a packet bigger than that. However, Mono 2.10 bug in setting Socket
-                // options could cause the RcvSize/SndSize to contain an arbitrary value so the test might fail 
+                // options could cause the RcvSize/SndSize to contain an arbitrary value so the test might fail
                 // with smaller message sizes.
                 //
                 test(seq.Length > 16384 || IceInternal.AssemblyUtil.runtime_ == IceInternal.AssemblyUtil.Runtime.Mono);
@@ -138,8 +138,8 @@ public class AllTests
                 bool b = replyI.waitReply(1, 500);
                 //
                 // The server's Ice.UDP.RcvSize property is set to 16384, which means this packet
-                // should not be delivered. However, Mono 2.10 bug in setting Socket options could 
-                // cause the RcvSize/SndSize to contain an arbitrary value so the packet might 
+                // should not be delivered. However, Mono 2.10 bug in setting Socket options could
+                // cause the RcvSize/SndSize to contain an arbitrary value so the packet might
                 // be delivered successfully.
                 //
                 test(!b || IceInternal.AssemblyUtil.runtime_ == IceInternal.AssemblyUtil.Runtime.Mono);
@@ -148,7 +148,7 @@ public class AllTests
             {
                 //
                 // Mono 2.10 bug in setting Socket options could cause the RcvSize/SndSize to contain
-                // an arbitrary value so the message send might fail if the effetive SndSize is minor 
+                // an arbitrary value so the message send might fail if the effetive SndSize is minor
                 // than expected.
                 //
                 test(IceInternal.AssemblyUtil.runtime_ == IceInternal.AssemblyUtil.Runtime.Mono);
@@ -229,7 +229,7 @@ public class AllTests
 
         //
         // Sending the replies back on the multicast UDP connection doesn't work for most
-        // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+        // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
         // Windows...). For Windows, see UdpTransceiver constructor for the details. So
         // we don't run this test.
         //
diff --git a/csharp/test/IceDiscovery/simple/run.py b/csharp/test/IceDiscovery/simple/run.py
index 964dedf4943..e25a9f04f7a 100755
--- a/csharp/test/IceDiscovery/simple/run.py
+++ b/csharp/test/IceDiscovery/simple/run.py
@@ -30,7 +30,7 @@ args += " --IceDiscovery.Timeout=50"
 args += " --IceDiscovery.RetryCount=5"
 
 if TestUtil.isDarwin() and TestUtil.ipv6:
-   print("test not supported on OS X with IPv6")
+   print("test not supported on macOS with IPv6")
    sys.exit(0)
 
 if not TestUtil.ipv6:
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md
index 3e6dc33f58b..77e23115506 100644
--- a/java/BuildInstructions.md
+++ b/java/BuildInstructions.md
@@ -8,7 +8,7 @@ platforms.
 
 ### Operating Systems
 
-Ice for Java is expected to build and run properly on Windows, OS X, and any
+Ice for Java is expected to build and run properly on Windows, macOS, and any
 recent Linux distribution for x86 and x86_64, and was extensively tested using
 the operating systems and compiler versions listed for our [supported
 platforms][2]. Due to the portability of Java, it is very likely that it will
@@ -111,13 +111,13 @@ The Maven package id for the ProGuard package is as follows:
 
 ### Java Application Bundler
 
-Under OS X Gradle uses the Java Application Bundler to create an application
+Under macOS Gradle uses the Java Application Bundler to create an application
 bundle for the graphical IceGrid administrative tool.
 
 The Maven package id for the application bundler package is as follows:
 
     groupId=com.oracle, version=1.0, artifactId=appbundler
- 
+
 ## Compiling Ice for Java
 
 ### Preparing to Build
@@ -221,7 +221,7 @@ You can start the tool with the following command:
 
     > java -jar icegridgui.jar
 
-In OS X there is also an application bundle named IceGrid Admin. You can start
+In macOS there is also an application bundle named IceGrid Admin. You can start
 the IceGrid Admin tool by double-clicking the IceGrid Admin icon in Finder.
 
 ## Test Controller
diff --git a/java/src/Ice/src/main/java/IceInternal/Selector.java b/java/src/Ice/src/main/java/IceInternal/Selector.java
index b3b5f7858ec..1ce3ef05efb 100644
--- a/java/src/Ice/src/main/java/IceInternal/Selector.java
+++ b/java/src/Ice/src/main/java/IceInternal/Selector.java
@@ -149,7 +149,7 @@ public final class Selector
         }
         _interrupted = false;
         _spuriousWakeUp = 0;
-        
+
         for(java.nio.channels.SelectionKey key : _keys)
         {
             EventHandler handler = (EventHandler)key.attachment();
@@ -203,7 +203,7 @@ public final class Selector
             }
             catch(java.nio.channels.CancelledKeyException ex)
             {
-                // This sometime occurs on OS X, ignore.
+                // This sometime occurs on macOS, ignore.
                 continue;
             }
             catch(java.io.IOException ex)
@@ -233,7 +233,7 @@ public final class Selector
             break;
         }
     }
-    
+
     void wakeup()
     {
         _selector.wakeup();
@@ -338,5 +338,5 @@ public final class Selector
     private java.util.HashSet<EventHandler> _changes = new java.util.HashSet<EventHandler>();
     private boolean _selecting;
     private boolean _interrupted;
-    private int _spuriousWakeUp;    
+    private int _spuriousWakeUp;
 }
diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
index 9748f99844b..421c9354b5d 100644
--- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
+++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
@@ -371,7 +371,7 @@ final class UdpTransceiver implements Transceiver
             Network.setBlock(_fd, false);
             //
             // NOTE: setting the multicast interface before performing the
-            // connect is important for some OS such as OS X.
+            // connect is important for some OS such as macOS.
             //
             if(_addr.getAddress().isMulticastAddress())
             {
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index bf0fa450fb2..96a054c7902 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -141,4 +141,4 @@ clean {
 
 if(macosx) {
     install.dependsOn(copyBundle)
-}
\ No newline at end of file
+}
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java
index 6878ccc2f79..c9c8b8022f4 100644
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java
@@ -29,7 +29,7 @@ public class Main extends JFrame
         //
         try
         {
-            if(System.getProperty("os.name").startsWith("Mac OS")) // OS X L&F
+            if(System.getProperty("os.name").startsWith("Mac OS")) // macOS L&F
             {
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             }
@@ -91,10 +91,10 @@ public class Main extends JFrame
                 {
                     if(_coordinator != null)
                     {
-                        if(_coordinator.needsSaving()) 
+                        if(_coordinator.needsSaving())
                         {
                             if(JOptionPane.showOptionDialog(
-                                            Main.this, 
+                                            Main.this,
                                             "The application has unsave changes, if you exit all unsaved changes will be lost.\n" +
                                             "Exit and discard changes?",
                                             "Save application", JOptionPane.YES_NO_OPTION,
diff --git a/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
index 27110ff8ff7..9bdb018b8b6 100644
--- a/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -59,7 +59,7 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
         _category = category;
 
         //
-        // NOTE: COMPILERBUG: The timeout here is required for OS X. It shouldn't be too low since
+        // NOTE: COMPILERBUG: The timeout here is required for macOS. It shouldn't be too low since
         // some operations can take some time to complete on slow machines.
         //
         _evictorAdapter = communicator.
diff --git a/java/test/src/main/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java
index ff5fba84bf6..dc8b00dfe9c 100644
--- a/java/test/src/main/java/test/Ice/udp/AllTests.java
+++ b/java/test/src/main/java/test/Ice/udp/AllTests.java
@@ -218,7 +218,7 @@ public class AllTests
 
         //
         // Sending the replies back on the multicast UDP connection doesn't work for most
-        // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+        // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
         // Windows...). For Windows, see UdpTransceiver constructor for the details. So
         // we don't run this test.
         //
diff --git a/java/test/src/main/java/test/IceGrid/simple/AllTests.java b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
index df1970e2c34..d372e9b9dc3 100644
--- a/java/test/src/main/java/test/IceGrid/simple/AllTests.java
+++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
@@ -70,7 +70,7 @@ public class AllTests
             IceGrid.RegistryPrx registry = IceGrid.RegistryPrxHelper.checkedCast(
                 communicator.stringToProxy(communicator.getDefaultLocator().ice_getIdentity().category + "/Registry"));
             test(registry != null);
-            
+
             try
             {
                 IceGrid.AdminSessionPrx session = registry.createAdminSession("foo", "bar");
@@ -89,16 +89,16 @@ public class AllTests
             Ice.InitializationData initData = app.createInitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("Ice.Default.Locator", "");
-            initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery", 
+            initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
                                             "IceLocatorDiscovery:IceLocatorDiscovery.PluginFactory");
-            if(System.getProperty("os.name").contains("OS X") && 
+            if(System.getProperty("os.name").contains("OS X") &&
                initData.properties.getPropertyAsInt("Ice.PreferIPv6Address") > 0)
             {
                 initData.properties.setProperty("IceLocatorDiscovery.Interface", "::1");
             }
             initData.properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter");
             initData.properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default");
-        
+
             Ice.Communicator com =  Ice.Util.initialize(initData);
             test(com.getDefaultLocator() != null);
             com.stringToProxy("test @ TestAdapter").ice_ping();
@@ -116,7 +116,7 @@ public class AllTests
             //
             // Now, ensure that the IceGrid discovery locator correctly
             // handles failure to find a locator.
-            // 
+            //
             initData.properties.setProperty("IceLocatorDiscovery.InstanceName", "unknown");
             initData.properties.setProperty("IceLocatorDiscovery.RetryCount", "1");
             initData.properties.setProperty("IceLocatorDiscovery.Timeout", "100");
diff --git a/js/BuildInstructions.md b/js/BuildInstructions.md
index 7dfddc8f17a..c1637706ba5 100644
--- a/js/BuildInstructions.md
+++ b/js/BuildInstructions.md
@@ -54,7 +54,7 @@ This requires that you build the Java test controller from the Java subdirectory
 and test servers from C++, C# or Java. Follow the instructions from the
 corresponding language mapping to build the tests and the server controller.
 
-In OS X the first time you run the script, you will be prompted for your
+In macOS the first time you run the script, you will be prompted for your
 password. This is necessary to configure the trust setting for the HTTP
 server certificate, which will enable you to connect to the HTTP server
 with SSL via your web browser.
diff --git a/objective-c/BuildInstructions.md b/objective-c/BuildInstructions.md
index ef1d4514722..4e3aa40b88a 100644
--- a/objective-c/BuildInstructions.md
+++ b/objective-c/BuildInstructions.md
@@ -1,13 +1,13 @@
-# Building Ice for Objective-C on OS X
+# Building Ice for Objective-C on macOS
 
 This page describes how to build and install Ice for Objective-C from source
-code on OS X. If you prefer, you can install a [Homebrew][1] package instead.
+code on macOS. If you prefer, you can install a [Homebrew][1] package instead.
 
 ## Objective-C Build Requirements
 
 ### Operating Systems and Compilers
 
-Ice for Objective-C is currently only supported on OS X, and was extensively
+Ice for Objective-C is currently only supported on macOS, and was extensively
 tested using the operating system and compiler versions listed for our
 [supported platforms][2].
 
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules
index 394a11a1700..93be4988e0f 100644
--- a/objective-c/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -21,7 +21,7 @@ prefix			?= /opt/Ice-$(VERSION)
 
 #
 # The build architectures for gcc/llvm based builds. The format of
-# these build flags are OS dependent. For example, under OS X to
+# these build flags are OS dependent. For example, under macOS to
 # build binaries which support both i386 and x86_64 you would use
 # "-arch i386 -arch x86_64".  The default is OS version dependent. Be
 # aware that this value may conflict with the setting of LP64 above.
diff --git a/objective-c/src/Ice/Makefile b/objective-c/src/Ice/Makefile
index 667cfa11b63..64a10ea7ec4 100644
--- a/objective-c/src/Ice/Makefile
+++ b/objective-c/src/Ice/Makefile
@@ -86,7 +86,7 @@ include $(top_srcdir)/config/Make.rules
 
 #
 # Set RPATH to the cpp/lib directory or Ice installation lib directory. Note that unlike Linux
-# platforms, we always set the RPATH for source builds on OS X. This is required because we
+# platforms, we always set the RPATH for source builds on macOS. This is required because we
 # can no longer rely on DYLD_LIBRARY_PATH on El Capitan. The RPATH is updated when the library
 # is installed (see cpp/config/Make.rules.Darwin).
 #
diff --git a/php/BuildInstructionsLinuxOSX.md b/php/BuildInstructionsLinuxOSX.md
index b790415a878..7a739010dad 100644
--- a/php/BuildInstructionsLinuxOSX.md
+++ b/php/BuildInstructionsLinuxOSX.md
@@ -1,7 +1,7 @@
-# Building Ice for PHP on Linux and OS X
+# Building Ice for PHP on Linux and macOS
 
 This page describes how to build and install Ice for PHP from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## PHP Build Requirements
@@ -69,7 +69,7 @@ the following line on Linux:
 
     extension = IcePHP.so
 
-Or on OS X:
+Or on macOS:
 
     extension = IcePHP.dy
 
@@ -82,7 +82,7 @@ Open the configuration file and append the following line on Linux:
 
     extension = IcePHP.so
 
-Or on OS X:
+Or on macOS:
 
     extension = IcePHP.dy
 
@@ -92,7 +92,7 @@ shown below:
     $ php -m
 
 Look for `ice` among the installed modules. Note that your library search path
-(`LD_LIBRARY_PATH` on Linux or `DYLD_LIBRARY_PATH` on OS X) must include the
+(`LD_LIBRARY_PATH` on Linux or `DYLD_LIBRARY_PATH` on macOS) must include the
 directory containing the Ice shared libraries.
 
 Read the PHP Dependencies and PHP Source Files sections below for more
diff --git a/php/config/Make.rules.Darwin b/php/config/Make.rules.Darwin
index 37d1a659a57..e32b2b28bf5 100644
--- a/php/config/Make.rules.Darwin
+++ b/php/config/Make.rules.Darwin
@@ -23,7 +23,7 @@ LDPLATFORMFLAGS += ${wl}-flat_namespace ${wl}-undefined ${wl}suppress $(LDEXEFLA
 ifneq ($(STATICLIBS),yes)
     #
     # Set RPATH to the cpp/lib directory or Ice installation lib directory. Note that unlike Linux
-    # platforms, we always set the RPATH for source builds on OS X. This is required because we
+    # platforms, we always set the RPATH for source builds on macOS. This is required because we
     # can no longer rely on DYLD_LIBRARY_PATH on El Capitan. The RPATH is updated when the library
     # is installed (see cpp/config/Make.rules.Darwin).
     #
diff --git a/php/config/Make.rules.php b/php/config/Make.rules.php
index bdd601e4e27..cd961a45205 100644
--- a/php/config/Make.rules.php
+++ b/php/config/Make.rules.php
@@ -17,14 +17,14 @@ prefix			?= /opt/Ice-$(VERSION)
 #
 # The "root directory" for runpath embedded in executables. Can be set
 # to change the runpath added to Ice executables. The default is
-# platform dependent (Linux only, on OS X the embedded runpath is always
+# platform dependent (Linux only, on macOS the embedded runpath is always
 # based on @loader_path).
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define embedded_runpath as no if you don't want any RPATH added to
-# the executables (Linux only, on OS X we always add a runpath).
+# the executables (Linux only, on macOS we always add a runpath).
 #
 embedded_runpath 	?= yes
 
diff --git a/python/BuildInstructionsLinuxOSX.md b/python/BuildInstructionsLinuxOSX.md
index a3756e1f0b2..69f5ba47363 100644
--- a/python/BuildInstructionsLinuxOSX.md
+++ b/python/BuildInstructionsLinuxOSX.md
@@ -1,14 +1,14 @@
-# Building Ice for Python on Linux and OS X
+# Building Ice for Python on Linux and macOS
 
 This page describes how to build and install Ice for Python from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## Python Build Requirements
 
 ### Operating Systems and Compilers
 
-Ice for Python is expected to build and run properly on OS X and any recent
+Ice for Python is expected to build and run properly on macOS and any recent
 Linux distribution for x86 and x86_64, and was extensively tested using the
 operating systems and compiler versions listed for our [supported platforms][2].
 
diff --git a/python/config/Make.rules b/python/config/Make.rules
index 042a591ff6e..6b10997ab86 100644
--- a/python/config/Make.rules
+++ b/python/config/Make.rules
@@ -16,14 +16,14 @@ prefix			?= /opt/Ice-$(VERSION)
 #
 # The "root directory" for runpath embedded in executables. Can be set
 # to change the runpath added to Ice executables. The default is
-# platform dependent (Linux only, on OS X the embedded runpath is always
+# platform dependent (Linux only, on macOS the embedded runpath is always
 # based on @loader_path).
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define embedded_runpath as no if you don't want any RPATH added to
-# the executables (Linux only, on OS X we always add a runpath).
+# the executables (Linux only, on macOS we always add a runpath).
 #
 embedded_runpath 	?= yes
 
@@ -69,7 +69,7 @@ PYTHON_LIBS	    ?= -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME)
 
 #
 # The build architectures for gcc based builds. The format of these
-# build flags are OS dependent. For example, under OS X to build
+# build flags are OS dependent. For example, under macOS to build
 # binaries which support both i386 and x86_64 you would use "-arch
 # i386 -arch x86_64".  The default is OS version dependent. Be aware
 # that this value may conflict with the setting of LP64 above.
@@ -186,7 +186,7 @@ all:: $(SRCS)
 .cpp.o:
 	@mkdir -p .depend
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(MAKEDEPENDFLAGS) $< -MF .depend/$(*F).d
-	
+
 clean::
 	-rm -f $(TARGETS)
 	-rm -f core *.o *.pyc *.bak
diff --git a/python/config/Make.rules.Darwin b/python/config/Make.rules.Darwin
index 48adf60ff2c..c1631fe08ec 100644
--- a/python/config/Make.rules.Darwin
+++ b/python/config/Make.rules.Darwin
@@ -23,7 +23,7 @@ mkshlib		= $(CXX) -dynamiclib $(shlibldflags) -o $(1) -install_name @rpath/$(2)
 ifneq ($(STATICLIBS),yes)
     #
     # Set RPATH to the cpp/lib directory or Ice installation lib directory. Note that unlike Linux
-    # platforms, we always set the RPATH for source builds on OS X. This is required because we
+    # platforms, we always set the RPATH for source builds on macOS. This is required because we
     # can no longer rely on DYLD_LIBRARY_PATH on El Capitan. The RPATH is updated when the library
     # is installed (see cpp/config/Make.rules.Darwin).
     #
diff --git a/python/python/Ice.py b/python/python/Ice.py
index 215a1fc92aa..23c4fdf2c69 100644
--- a/python/python/Ice.py
+++ b/python/python/Ice.py
@@ -334,7 +334,7 @@ def getSliceDir():
 
     elif sys.platform == "darwin":
         #
-        # Check the default OS X location.
+        # Check the default macOS location.
         #
         dir = os.path.join("/", "Library", "Developer", "Ice-" + iceVer, "slice")
         if os.path.exists(dir):
diff --git a/ruby/BuildInstructionsLinuxOSX.md b/ruby/BuildInstructionsLinuxOSX.md
index 8d252d2f89d..1e67b49fe6b 100644
--- a/ruby/BuildInstructionsLinuxOSX.md
+++ b/ruby/BuildInstructionsLinuxOSX.md
@@ -1,21 +1,21 @@
 # Building Ice for Ruby on Linux
 
 This file describes how to build and install Ice for Ruby from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## Ruby Build Requirements
 
 ### Operating Systems and Compilers
 
-Ice for Ruby is expected to build and run properly on OS X and on any recent
+Ice for Ruby is expected to build and run properly on macOS and on any recent
 Linux distribution for x86 and x86_64, and was extensively tested using the
 operating systems and Ruby versions listed for our [supported platforms][2].
 
 ### Ruby Versions
 
 Ice for Ruby supports Ruby versions 1.8.1 or later. You can use a source or
-binary installation of Ruby. 
+binary installation of Ruby.
 
 If you use an RPM installation, the following packages are required:
 
@@ -92,7 +92,7 @@ You must also modify `LD_LIBRARY_PATH` or `DYLD_LIBRARY_PATH` to include the
 directory `/opt/Ice/lib`:
 
     $ export LD_LIBRARY_PATH=/opt/Ice/lib:$LD_LIBRARY_PATH       (Linux)
-    $ export DYLD_LIBRARY_PATH=/opt/Ice/lib:$DYLD_LIBRARY_PATH   (OS X)
+    $ export DYLD_LIBRARY_PATH=/opt/Ice/lib:$DYLD_LIBRARY_PATH   (macOS)
 
 To verify that Ruby can load the Ice extension successfully, open a command
 window and start the interpreter using `irb`:
diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules
index 61354711b82..72bd05b67a4 100644
--- a/ruby/config/Make.rules
+++ b/ruby/config/Make.rules
@@ -17,14 +17,14 @@ prefix			?= /opt/Ice-$(VERSION)
 #
 # The "root directory" for runpath embedded in executables. Can be set
 # to change the runpath added to Ice executables. The default is
-# platform dependent (Linux only, on OS X the embedded runpath is always
+# platform dependent (Linux only, on macOS the embedded runpath is always
 # based on @loader_path).
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define embedded_runpath as no if you don't want any RPATH added to
-# the executables (Linux only, on OS X we always add a runpath).
+# the executables (Linux only, on macOS we always add a runpath).
 #
 embedded_runpath 	?= yes
 
@@ -117,7 +117,7 @@ endif
 
 #
 # The build architectures for gcc based builds. The format of these
-# build flags are OS dependent. For example, under OS X to build
+# build flags are OS dependent. For example, under macOS to build
 # binaries which support both i386 and x86_64 you would use "-arch
 # i386 -arch x86_64".  The default is OS version dependent. Be aware
 # that this value may conflict with the setting of LP64 above.
@@ -140,7 +140,7 @@ else
     include $(top_srcdir)/../config/Make.common.rules
 endif
 
-# OS X & macOS with LLVM-Clang > 7.3 and the system version of Ruby require '-Wno-shift-negative-value'. This issue
+# macOS & macOS with LLVM-Clang > 7.3 and the system version of Ruby require '-Wno-shift-negative-value'. This issue
 # has been patched in more recent 2.x Ruby versions.
 ifeq ($(UNAME),Darwin)
     ifeq ($(shell which $(RUBY)),/usr/bin/ruby)
diff --git a/ruby/config/Make.rules.Darwin b/ruby/config/Make.rules.Darwin
index 58f4a2c0540..7d218b35232 100644
--- a/ruby/config/Make.rules.Darwin
+++ b/ruby/config/Make.rules.Darwin
@@ -26,7 +26,7 @@ mkshlib = $(CXX)  -dynamic -bundle $(shlibldflags) -o $(1) $(3) $(4)
 ifneq ($(STATICLIBS),yes)
     #
     # Set RPATH to the cpp/lib directory or Ice installation lib directory. Note that unlike Linux
-    # platforms, we always set the RPATH for source builds on OS X. This is required because we
+    # platforms, we always set the RPATH for source builds on macOS. This is required because we
     # can no longer rely on DYLD_LIBRARY_PATH on El Capitan. The RPATH is updated when the library
     # is installed (see cpp/config/Make.rules.Darwin).
     #
diff --git a/scripts/TestController.py b/scripts/TestController.py
index f1979a20075..20a42880823 100644
--- a/scripts/TestController.py
+++ b/scripts/TestController.py
@@ -34,7 +34,7 @@ def removeTrustSettings():
         print("trust settings already removed")
 
 #
-# On OS X, provide an option to allow removing the trust settings
+# On macOS, provide an option to allow removing the trust settings
 #
 if TestUtil.isDarwin():
     try:
@@ -67,7 +67,7 @@ signal.signal(signal.SIGTERM, signal_handler)
 
 if TestUtil.isDarwin():
     #
-    # On OS X, we set the trust settings on the certificate to prevent
+    # On macOS, we set the trust settings on the certificate to prevent
     # the Web browsers from prompting the user about the unstrusted
     # certificate. Some browsers such as Chrome don't provide the
     # option to set this trust settings.