A bunch of "{Mac} OS X" -> "macOS" changes.

Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 12:15:27 -07:00 · 2017-04-05 12:15:27 -07:00 · 357cfd3b03
parent 1f94d34f43
commit 357cfd3b03
78 changed files with 175 additions and 174 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -323,11 +323,11 @@ else()
 	if(CMAKE_OSX_DEPLOYMENT_TARGET)
 		if(APPLE)
 			if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.0")
-				message(FATAL_ERROR "We don't support building for OS X 10.0")
+				message(FATAL_ERROR "We don't support building for Mac OS X 10.0")
 			elseif(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.1")
-				message(FATAL_ERROR "We don't support building for OS X 10.1")
+				message(FATAL_ERROR "We don't support building for Mac OS X 10.1")
 			elseif(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.2")
-				message(FATAL_ERROR "We don't support building for OS X 10.2")
+				message(FATAL_ERROR "We don't support building for Mac OS X 10.2")
 			elseif(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.4" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5")
 				#
 				# Only 32-bit builds are supported.  10.5
@ -339,9 +339,9 @@ else()
 				set(CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}")
 				set(WS_LINK_FLAGS "-m32 ${WS_LINK_FLAGS}")
 			endif()
-			message(STATUS "Building for OS X ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+			message(STATUS "Building for Mac OS X/OS X/macOS ${CMAKE_OSX_DEPLOYMENT_TARGET}")
 		else()
-			message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET only applies when building for OS X")
+			message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET only applies when building for macOS")
 		endif()
 	endif()

@ -702,7 +702,7 @@ foreach(THIS_FLAG ${WIRESHARK_LD_FLAGS})
 endforeach()

 if(APPLE AND EXISTS /usr/local/opt/gettext)
-	# GLib on OS X requires libintl. Homebrew installs gettext (and
+	# GLib on macOS requires libintl. Homebrew installs gettext (and
 	# libintl) in /usr/local/opt/gettext
 	include_directories(/usr/local/opt/gettext/include)
 	link_directories(/usr/local/opt/gettext/lib)
@ -1104,7 +1104,7 @@ message(STATUS "Warnings as errors: ${WERROR_COMMON_FLAGS}")

 if(APPLE)
 	#
-	# We assume that APPLE means OS X so that we have the OS X
+	# We assume that APPLE means macOS so that we have the macOS
 	# frameworks.
 	#
 	set(HAVE_OS_X_FRAMEWORKS 1)
@ -1153,9 +1153,9 @@ add_subdirectory( wiretap )
 add_subdirectory( writecap )

 # Location of our data files. This should be set to a value that allows
-# running from the build directory on Windows, on OS X when building an
-# application bundle, and on UNIX if WIRESHARK_RUN_FROM_BUILD_DIRECTORY
-# is set.
+# running from the build directory on Windows, on macOS when building an
+# application bundle, and on UNIX in general if
+# WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set.
 if(ENABLE_APPLICATION_BUNDLE)
 	set(_datafile_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/share/wireshark")
 else()
@ -1183,9 +1183,10 @@ endif()

 if(ENABLE_EXTCAP)
 	# Target platform locations
-	# UNIX, Linux, non-bundled OS X: $DESTDIR/lib/wireshark/extcap
+	# UN*X in general, including macOS if not building an app bundle:
+	# $DESTDIR/lib/wireshark/extcap
 	# Windows: $DESTDIR/extcap
-	# OS X app bundle: Wireshark.app/Contents/Resources/share/wireshark/extcap
+	# macOS app bundle: Wireshark.app/Contents/Resources/share/wireshark/extcap
 	set(HAVE_EXTCAP 1)
 	if (WIN32)
 		set(EXTCAP_DIR "extcap")
@ -1213,9 +1214,10 @@ endif()
 # from the build directory similar to DATAFILE_DIR above.
 if(ENABLE_PLUGINS)
 	# Target platform locations
-	# UNIX, Linux, non-bundled OS X: $DESTDIR/lib/wireshark/plugins/$VERSION
+	# UN*X in general, including macOS if not building an app bundle:
+	# $DESTDIR/lib/wireshark/plugins/$VERSION
 	# Windows: $DESTDIR/wireshark/plubins/$VERSION
-	# OS X app bundle: Wireshark.app/Contents/PlugIns/wireshark
+	# macOS app bundle: Wireshark.app/Contents/PlugIns/wireshark
 	set(HAVE_PLUGINS 1)
 	add_custom_target(plugins)
 	set_target_properties(plugins PROPERTIES FOLDER "Plugins")
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@ -93,7 +93,7 @@ set(DUMPCAP_INSTALL_OPTION   "normal" CACHE STRING "Permissions to install")
 set(DUMPCAP_INST_VALS "normal" "suid" "capabilities")
 set_property(CACHE DUMPCAP_INSTALL_OPTION PROPERTY STRINGS ${DUMPCAP_INST_VALS})
 if(APPLE)
-	option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" ON)
+	option(ENABLE_APPLICATION_BUNDLE "Build a macOS application bundle (Wireshark.app)" ON)
 else()
-	option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" OFF)
+	option(ENABLE_APPLICATION_BUNDLE "Build a macOS application bundle (Wireshark.app)" OFF)
 endif()
--- a/Makefile.am
+++ b/Makefile.am
@ -968,7 +968,7 @@ libtool: $(LIBTOOL_DEPS)
 # FreeBSD install command has a -T flag that takes an argument and
 # that has completely different semantics.
 #
-# We neither need nor want any of this on OS X, nor do we want it if
+# We neither need nor want any of this on macOS, nor do we want it if
 # we're not building Wireshark (that being the only desktop app).
 #
 install-data-local:
@ -1039,7 +1039,7 @@ uninstall-hook: update-databases-and-caches-uninstall
 # We only need to run gtk-update-icon-cache if we're installing a GTK+
 # version of Wireshark.
 #
-# We neither need nor want any of this on OS X, nor do we want it if
+# We neither need nor want any of this on macOS, nor do we want it if
 # we're not building Wireshark (that being the only desktop app).
 #
 update-databases-and-caches-common:
@ -1112,7 +1112,7 @@ osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
 			--extcap-path ../staging/$(PACKAGE).inst$(extcapdir) \
 			--library-path ../staging/$(PACKAGE).inst$(libdir) ; \
 	else \
-		echo "Error: OS X packaging tools not found." ; \
+		echo "Error: macOS packaging tools not found." ; \
 		echo "Package build abandoned." ; \
 	fi

--- a/2
+++ b/2
@ -29,7 +29,7 @@ The Wireshark project builds and tests regularly on the following platforms:

  - Linux (Ubuntu)
  - Microsoft Windows
-  - macOS / OS X
+  - macOS / {Mac} OS X

 Official installation packages are available for Microsoft Windows and
 macOS.
--- a/README.cmake
+++ b/README.cmake
@ -57,7 +57,7 @@ Note 1:
  # http://public.kitware.com/Bug/view.php?id=13818
  -DPYTHON_EXECUTABLE=c:/Python27/python

-  # Disable building an application bundle (Wireshark.app) on OS X
+  # Disable building an application bundle (Wireshark.app) on macOS
  -DENABLE_APPLICATION_BUNDLE=OFF

  # Qt Creator expects .cbp files when used with CMake.
@ -155,13 +155,13 @@ All the executables now build from clean source on:
 * 32 bit Ubuntu 10.04
 * 64 bit Ubuntu 14.04
 * 64 bit Debian Wheezy
-* 32 bit OS X
-* 64 bit OS X
+* 32 bit Mac OS X
+* 64 bit {Mac} OS X/macOS
 * 32 bit Windows using Visual C++ 2013
 * 64 bit Windows using Visual C++ 2013
 * 64 bit Solaris 10

-The Buildbot runs CMake steps on Ubuntu, Win32, Win64, OS X, and Solaris.
+The Buildbot runs CMake steps on Ubuntu, Win32, Win64, macOS, and Solaris.
 Windows packages are built using CMake steps.

 What needs to be done?
@ -172,9 +172,9 @@ What needs to be done?
 - Guides are not installed.
 - Build source package (using CPack).
  This is obsolete if we decide to release VCS snapshots instead
- Build packages using CPack: tarball, Windows installer + PortableApps, OS X
+- Build packages using CPack: tarball, Windows installer + PortableApps, macOS
  installer dmg, RPM, SVR4. This includes setting OS target version stuff
-  appropriately for OS X. We currently use NSIS for the Windows installer but
+  appropriately for macOS. We currently use NSIS for the Windows installer but
  should probably use WiX instead.
 - Add support for cmake configurations.
 - Get cross-compilation working (or ensure it does). It works with autofoo--and
--- a/README.macos
+++ b/README.macos
@ -1,8 +1,9 @@
-This file tries to help building Wireshark for (Mac) OS X (Wireshark
-does not work on earlier versions of Mac OS).
+This file tries to help building Wireshark for macOS (The Operating
+System Formerly Known As Mac OS X And Then OS X) (Wireshark does not
+work on the classic Mac OS).

 You must have the developer tools (called Xcode) installed.  For
-versions of OS X up to and including Snow Leopard, Xcode 3 should be
+versions of macOS up to and including Snow Leopard, Xcode 3 should be
 available on the install DVD; Xcode 4 is available for download from
 developer.apple.com and, for Lion and later releases, from the Mac App
 Store.  See
@ -35,7 +36,7 @@ environment variable's setting includes both /usr/X11/lib/pkgconfig and
 If you wish to build the legacy (GTK+) UI you must have X11 and the X11
 developer headers and libraries installed, as well as the Pango, ATK,
 and GTK+ libraries; otherwise, you will not be able to build or install
-GTK+.  The X11 and X11 SDK that come with OS X releases for releases
+GTK+.  The X11 and X11 SDK that come with macOS releases for releases
 from Panther to Lion can be used to build and run Wireshark.  Mountain
 Lion and later do not include X11; you should install X11 from
 elsewhere, such as
@ -51,7 +52,7 @@ you've added new source files to the Wireshark source.

 Then run the configure script, and run make to build Wireshark.

-If you upgrade the major release of OS X on which you are building
+If you upgrade the major release of macOS on which you are building
 Wireshark, we advise that, before you do any builds after the upgrade,
 you do, in the build directory:

@ -73,9 +74,9 @@ build 64-bit by default.
 This means that you will, by default, get a 64-bit version of Wireshark.

 One consequence of this is that, if you built and installed any required
-or optional libraries for Wireshark on an earlier release of OS X, those
+or optional libraries for Wireshark on an earlier release of macOS, those
 are probably 32-bit versions of the libraries, and you will need to
-un-install them and rebuild them on your current version of OS X, to get
+un-install them and rebuild them on your current version of macOS, to get
 64-bit versions.

 Some required and optional libraries require special attention if you
@ -85,7 +86,7 @@ releases; the macosx-setup.sh script will handle that for you.
 GLib - the GLib configuration script determines whether the system's
 libiconv is GNU iconv or not by checking whether it has libiconv_open(),
 and the compile will fail if that test doesn't correctly indicate
-whether libiconv is GNU iconv.  In OS X, libiconv is GNU iconv, but the
+whether libiconv is GNU iconv.  In macOS, libiconv is GNU iconv, but the
 64-bit version doesn't have libiconv_open(); a workaround for this is to
 replace all occurrences of "libiconv_open" with "iconv_open" in the
 configure script before running the script.  The macosx-setup.sh setup
@ -100,7 +101,7 @@ GTK+ with the CUPS printing backend disabled.
 libgcrypt - the libgcrypt configuration script attempts to determine
 which flavor of assembler-language routines to use based on the platform
 type determined by standard autoconf code.  That code uses uname to
-determine the processor type; however, in OS X, uname always reports
+determine the processor type; however, in macOS, uname always reports
 "i386" as the processor type on Intel machines, even Intel machines with
 64-bit processors, so it will attempt to assemble the 32-bit x86
 assembler-language routines, which will fail.  The workaround for this
@ -108,7 +109,7 @@ is to run the configure script with the --disable-asm argument, so that
 the assembler-language routines are not used.  The macosx-setup.sh will
 configure libgcrypt with that option.

-PortAudio - when compiling on OS X, the configure script for the
+PortAudio - when compiling on macOS, the configure script for the
 pa_stable_v19_20071207 version of PortAudio will cause certain
 platform-dependent build environment #defines to be set in the Makefile
 rules, and to cause a universal build to be done; those #defines will be
@ -119,7 +120,7 @@ if a universal build is attempted.  The macosx-setup.sh script downloads
 a newer version, and also suppresses the universal build.

 GeoIP - Their man pages "helpfully" have an ISO 8859-1 copyright symbol
-in the copyright notice, but OS X's default character encoding is UTF-8. 
+in the copyright notice, but macOS's default character encoding is UTF-8. 
 sed on Mountain Lion barfs at the "illegal character sequence"
 represented by an ISO 8859-1 copyright symbol, as it's not a valid UTF-8
 sequence.  The macosx-setup.sh script uses iconv to convert the man page
--- a/caputils/capture-pcap-util-unix.c
+++ b/caputils/capture-pcap-util-unix.c
@ -356,14 +356,14 @@ request_high_resolution_timestamp(pcap_t *pcap_h)
 {
 #ifdef __APPLE__
 	/*
-	 * On OS X, if you build with a newer SDK, pcap_set_tstamp_precision()
+	 * On macOS, if you build with a newer SDK, pcap_set_tstamp_precision()
 	 * is available, so the code will be built with it.
 	 *
 	 * However, if you then try to run on an older release that
 	 * doesn't have pcap_set_tstamp_precision(), the dynamic linker
 	 * will fail, as it won't find pcap_set_tstamp_precision().
 	 *
-	 * libpcap doesn't use OS X "weak linking" for new routines,
+	 * libpcap doesn't use macOS "weak linking" for new routines,
 	 * so we can't just check whether a pointer to
 	 * pcap_set_tstamp_precision() is null and, if it is, not
 	 * call it.  We have to, instead, use dlopen() to load
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@ -109,7 +109,7 @@ static const char please_report[] =
 #include <wsutil/cfutils.h>

 /*
- * On OS X, we get the "friendly name" and interface type for the interface
+ * On macOS, we get the "friendly name" and interface type for the interface
 * from the System Configuration framework.
 *
 * To find the System Configuration framework information for the
@ -127,7 +127,7 @@ static const char please_report[] =
 * an SNMP MIB-II ifType value.
 *
 * However, it's IFT_ETHER, i.e. Ethernet, for AirPort interfaces,
- * not IFT_IEEE80211 (which isn't defined in OS X in any case).
+ * not IFT_IEEE80211 (which isn't defined in macOS in any case).
 *
 * Perhaps some other BSD-flavored OSes won't make this mistake;
 * however, FreeBSD 7.0 and OpenBSD 4.2, at least, appear to have
--- a/caputils/iface_monitor.c
+++ b/caputils/iface_monitor.c
@ -177,7 +177,7 @@ iface_mon_stop(void)
 #elif defined(__APPLE__)

 /*
- * OS X.
+ * macOS.
 */

 #include <stddef.h>
--- a/caputils/iface_monitor.h
+++ b/caputils/iface_monitor.h
@ -37,7 +37,7 @@ extern "C" {
 *
 * XXX - we really want "gone", not "down", where "gone" may include
 * "down" if the OS requires an interface to be up in order to start
- * a capture on it (as is the case in Linux and in OS X prior to
+ * a capture on it (as is the case in Linux and in macOS prior to
 * Lion), but should also include *gone*, as in "there is no longer
 * an interface with this name, so it's neither down nor up".
 *
--- a/cmake/modules/FindM.cmake
+++ b/cmake/modules/FindM.cmake
@ -13,7 +13,7 @@ IF (M_INCLUDE_DIRS)
 ENDIF (M_INCLUDE_DIRS)

 #
-# On OS X, make sure we do *NOT* find math.h in the Kernel framework,
+# On macOS, make sure we do *NOT* find math.h in the Kernel framework,
 # as that will convince CMake to cause the build to look there for
 # headers.
 #
--- a/cmake/modules/FindOS_X_FRAMEWORKS.cmake
+++ b/cmake/modules/FindOS_X_FRAMEWORKS.cmake
@ -1,16 +1,16 @@
 #
-# - Find OS X frameworks
-# Find various OS X frameworks if we're on OS X
+# - Find macOS frameworks
+# Find various macOS frameworks if we're on macOS
 #
 #  APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework
 #  APPLE_CORE_FOUNDATION_LIBRARY      - CoreFoundation frameowkr
 #  APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework
-#  HAVE_OS_X_FRAMEWORKS               - True if we're on OS X
+#  HAVE_OS_X_FRAMEWORKS               - True if we're on macOS


 if(APPLE)
 	#
-	# We assume that APPLE means OS X so that we have the OS X
+	# We assume that APPLE means macOS so that we have the macOS
 	# frameworks.
 	#
 	set(HAVE_OS_X_FRAMEWORKS 1)
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@ -58,7 +58,7 @@ if( PCAP_FOUND )
  #
  # Note: for pcap_breakloop() and pcap_findalldevs(), the autoconf script
  # checks for more than just whether the function exists, it also checks
-  # for whether pcap.h declares it; Mac OS X software/security updates can
+  # for whether pcap.h declares it; macOS software/security updates can
  # update libpcap without updating the headers.
  #
  check_function_exists( "pcap_breakloop" HAVE_PCAP_BREAKLOOP )
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@ -214,10 +214,10 @@
 /* Define to 1 if you have the <Ntddndis.h> header file. */
 #cmakedefine HAVE_NTDDNDIS_H 1

-/* Define to 1 if you have OS X frameworks */
+/* Define to 1 if you have macOS frameworks */
 #cmakedefine HAVE_OS_X_FRAMEWORKS 1

-/* Define to 1 if you have the OS X CFPropertyListCreateWithStream function */
+/* Define to 1 if you have the macOS CFPropertyListCreateWithStream function */
 #cmakedefine HAVE_CFPROPERTYLISTCREATEWITHSTREAM 1

 /* Define if pcap_breakloop is known */
--- a/doc/README.plugins
+++ b/doc/README.plugins
@ -331,8 +331,8 @@ The menu entries themselves are generated with the following code structure:
    ext_menubar_add_entry(os_menu, "Test Entry B",
            NULL, menu_cb, <user_data>);

-This will not work with the GTK version on OS X; the GTK interface is
-currently not supported on this platform.  The Qt interface on OS X
+This will not work with the GTK version on macOS; the GTK interface is
+currently not supported on this platform.  The Qt interface on macOS
 provides the menu.

 For a more detailed information, please refer to plugin_if.h
--- a/doc/README.vagrant
+++ b/doc/README.vagrant
@ -68,8 +68,8 @@ The various Wireshark applications can be run from the ~/build folder of the
 Ubuntu VM with commands such as `./run/wireshark`, `./run/tshark`, etc.

 To run the Wireshark GUI you will typically need an X server. If you are using
-macOS (OS X) as the host system then you would likely use XQuartz as your X
-server. XQuartz can be downloaded from https://www.xquartz.org/.
+macOS ({Mac} OS X) as the host system then you would likely use XQuartz as
+your X server. XQuartz can be downloaded from https://www.xquartz.org/.

 The Ubuntu VM can be shutdown or suspended from the host system with the
 commands `vagrant halt` and `vagrant suspend` repectively. In either case the
--- a/dumpcap.c
+++ b/dumpcap.c
@ -371,7 +371,7 @@ static gboolean need_timeout_workaround;
 /*
 * Timeout, in microseconds, for reads from the stream of captured packets
 * from a pipe.  Pipes don't have the same problem that BPF devices do
- * in OS X 10.6, 10.6.1, 10.6.3, and 10.6.4, so we always use a timeout
+ * in Mac OS X 10.6, 10.6.1, 10.6.3, and 10.6.4, so we always use a timeout
 * of 250ms, i.e. the same value as CAP_READ_TIMEOUT when not on one
 * of the offending versions of Snow Leopard.
 *
@ -3368,7 +3368,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
               (At least you will if g_strerror() doesn't show a local translation
               of the error.)

-               On FreeBSD and OS X, if a network adapter disappears while
+               On FreeBSD and macOS, if a network adapter disappears while
               you're capturing on it, you'll get a "read: Device not configured"
               error (ENXIO).  (See previous parenthetical note.)

@ -3877,7 +3877,7 @@ main(int argc, char *argv[])
     */
    if (uname(&osinfo) == 0) {
        /*
-         * Mac OS X 10.x uses Darwin {x+4}.0.0.  Mac OS X 10.x.y uses Darwin
+         * {Mac} OS X/macOS 10.x uses Darwin {x+4}.0.0; 10.x.y uses Darwin
         * {x+4}.y.0 (except that 10.6.1 appears to have a uname version
         * number of 10.0.0, not 10.1.0 - go figure).
         */
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@ -39,7 +39,7 @@
 * are most likely to take a long time, given the way address-to-name
 * lookups are done over NBNS).
 *
- * Mac OS X does have SIGALRM, but if you longjmp() out of a name resolution
+ * macOS does have SIGALRM, but if you longjmp() out of a name resolution
 * call in a signal handler, you might crash, because the state of the
 * resolution code that sends messages to lookupd might be inconsistent
 * if you jump out of it in middle of a call.
--- a/epan/aftypes.h
+++ b/epan/aftypes.h
@ -43,7 +43,7 @@ extern "C" {
 #define BSD_AF_IPX		23
 #define BSD_AF_INET6_BSD	24	/* NetBSD, OpenBSD, BSD/OS */
 #define BSD_AF_INET6_FREEBSD	28	/* FreeBSD, DragonFly BSD */
-#define BSD_AF_INET6_DARWIN	30	/* OS X, iOS, anything else Darwin-based */
+#define BSD_AF_INET6_DARWIN	30	/* macOS, iOS, anything else Darwin-based */

 /* Linux AF_ values. */
 #define LINUX_AF_UNSPEC		 0
--- a/epan/dissectors/packet-corosync-totemsrp.c
+++ b/epan/dissectors/packet-corosync-totemsrp.c
@ -186,7 +186,7 @@ static const value_string corosync_totemsrp_ip_address_family[] = {
  { COMMON_AF_INET,       "AF_INET"  },
  { BSD_AF_INET6_BSD,     "AF_INET6 (most BSD)" },
  { BSD_AF_INET6_FREEBSD, "AF_INET6 (FreeBSD)" },
-  { BSD_AF_INET6_DARWIN,  "AF_INET6 (OS X and iOS)" },
+  { BSD_AF_INET6_DARWIN,  "AF_INET6 (macOS and iOS)" },
  { LINUX_AF_INET6,       "AF_INET6 (Linux)" },
  { SOLARIS_AF_INET6,     "AF_INET6 (Solaris)" },
  { WINSOCK_AF_INET6,     "AF_INET6 (Windows)" },
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@ -1008,7 +1008,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
 			/*
 			 * XXX On FreeBSD rate & 0x80 means we have an MCS. On
 			 * Linux and AirPcap it does not.  (What about
-			 * Mac OS X, NetBSD, OpenBSD, and DragonFly BSD?)
+			 * macOS, NetBSD, OpenBSD, and DragonFly BSD?)
 			 *
 			 * This is an issue either for proprietary extensions
 			 * to 11a or 11g, which do exist, or for 11n
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@ -1658,7 +1658,7 @@ get_conversation_for_call(packet_info *pinfo)
 	 * there's no guarantee that the reply will come from the
 	 * address to which the call was sent.  We also don't
 	 * worry about the port *from* which the call was sent,
-	 * because some clients (*cough* OS X NFS client *cough*)
+	 * because some clients (*cough* macOS NFS client *cough*)
 	 * might send retransmissions from a different port from
 	 * the original request.
 	 */
@ -1710,7 +1710,7 @@ find_conversation_for_reply(packet_info *pinfo)
 	 * because there's no guarantee that the call was sent
 	 * to the address from which the reply came.  We also
 	 * don't worry about the port *to* which the reply was
-	 * sent, because some clients (*cough* OS X NFS client
+	 * sent, because some clients (*cough* macOS NFS client
 	 * *cough*) might send call retransmissions from a
 	 * different port from the original request, so replies
 	 * to the original call and a retransmission of the call
@ -2114,7 +2114,7 @@ looks_like_rpc_reply(tvbuff_t *tvb, packet_info *pinfo, int offset)
 	   because there's no guarantee that the call was sent
 	   to the address from which the reply came.  We also
 	   don't worry about the port *to* which the reply was
-	   sent, because some clients (*cough* OS X NFS client
+	   sent, because some clients (*cough* macOS NFS client
 	   *cough*) might send retransmissions from a
 	   different port from the original request, so replies
 	   to the original call and a retransmission of the call
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@ -11175,7 +11175,7 @@ proto_register_smb2(void)
 		},

 		{ &hf_smb2_aapl_server_query_caps_supports_osx_copyfile,
-			{ "Supports OS X copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64,
+			{ "Supports macOS copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64,
 			NULL, SMB2_AAPL_SUPPORTS_OSX_COPYFILE, NULL, HFILL }
 		},

--- a/epan/prefs.c
+++ b/epan/prefs.c
@ -3174,8 +3174,8 @@ prefs_register_modules(void)

    /* GTK+ only */
    prefs_register_bool_preference(gui_module, "macosx_style",
-                                   "Use OS X style",
-                                   "Use OS X style (OS X with native GTK only)?",
+                                   "Use macOS style",
+                                   "Use macOS style (macOS with native GTK only)?",
                                   &prefs.gui_macosx_style);

    prefs_register_obsolete_preference(gui_module, "geometry.main.x");
--- a/help/faq.py
+++ b/help/faq.py
@ -261,7 +261,7 @@ answer("""
 Wireshark&#174; is a network protocol analyzer. It lets you capture and
 interactively browse the traffic running on a computer network.  It has
 a rich and powerful feature set and is world's most popular tool of its
-kind. It runs on most computing platforms including Windows, OS X,
+kind. It runs on most computing platforms including Windows, macOS,
 Linux, and UNIX. Network professionals, security experts, developers,
 and educators around the world use it regularly. It is freely available
 as open source, and is released under the GNU General Public License
@ -729,12 +729,12 @@ with version 4.2.2 or a later version.
 """)

 question("""
-I've installed Wireshark from Fink on OS X; why is it very slow to
+I've installed Wireshark from Fink on macOS; why is it very slow to
 start up?
 """)

 answer("""
-When an application is installed on OS X, prior to 10.4, it is usually
+When an application is installed on macOS, prior to 10.4, it is usually
 "prebound" to speed up launching the application.  (That's what the
 "Optimizing" phase of installation is.)

@ -1204,7 +1204,7 @@ Most OSes do <strong>not</strong> support capturing the FCS of a frame
 on Ethernet, and probably do not support it on most other link-layer
 types.  Some drivres on some OSes do support it, such as some (all?)
 Ethernet drivers on NetBSD and possibly the driver for Apple's gigabit
-Ethernet interface in OS X; in those OSes, you might always get the
+Ethernet interface in macOS; in those OSes, you might always get the
 FCS, or you might only get the FCS if you capture in promiscuous mode
 (you'd have to determine which is the case).

--- a/image/README.image
+++ b/image/README.image
@ -57,7 +57,7 @@ image/capture_comment_add.png		created from elements in
 image/capture_comment_disabled.png	accessories-text-editor.svg and
 image/capture_comment_update.png	paper-sheets.svg

-plus-8.png				OS X style add / remove icons. Created by Peter Hosey.
+plus-8.png				macOS style add / remove icons. Created by Peter Hosey.
 minus-8.png				Released under CC-PD.

-copy-8.png				OS X style copy icon.
+copy-8.png				macOS style copy icon.
--- a/m4/ws_osx.m4
+++ b/m4/ws_osx.m4
@ -156,8 +156,6 @@ then

 		#
 		# Get the real version - strip off the "10.".
-		# We'll worry about that if, as, and when there's ever
-		# an OS XI.
 		#
 		deploy_real_version=`echo "$deploy_target" | sed -n 's/10\.\(.*\)/\1/p'`

@ -294,7 +292,7 @@ AC_SUBST(OSX_MIN_VERSION)
 # Checks for the presence of macOS integration functions in the GTK+ framework
 # or as a separate library.
 #
-# GTK+ for MAC OS X now lives on www.gtk.org at:
+# GTK+ for macOS now lives on www.gtk.org at:
 #
 #   http://www.gtk.org/download/macos.php
 #
--- a/macosx-support-lib-patches/qt-fix-pc-files
+++ b/macosx-support-lib-patches/qt-fix-pc-files
@ -21,7 +21,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # See bug QTBUG-35256 for the full painful story.  Shorter version:
-# the OS X Qt packages provide the Qt components as frameworks, but
+# the macOS Qt packages provide the Qt components as frameworks, but
 # the .pc files don't generate the right CFLAGS/CXXFLAGS to make
 # that work, so autoconf doesn't work correctly.
 #
--- a/packaging/macosx/ChmodBPF/ChmodBPF
+++ b/packaging/macosx/ChmodBPF/ChmodBPF
@ -1,10 +1,10 @@
 #! /bin/bash

 #
-# Unfortunately, Mac OS X's devfs is based on the old FreeBSD
+# Unfortunately, macOS's devfs is based on the old FreeBSD
 # one, not the current one, so there's no way to configure it
 # to create BPF devices with particular owners or groups. BPF
-# devices on Mac OS X are also non-cloning, that is they can
+# devices on macOS are also non-cloning, that is they can
 # be created on demand at any time. This startup item will
 # pre-create a number of BPF devices, then make them owned by
 # the access_bpf group, with permissions rw-rw----, so that
--- a/packaging/macosx/Info.plist.in
+++ b/packaging/macosx/Info.plist.in
@ -146,7 +146,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>Wiresharkdoc.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>OS X PacketLogger Capture</string>
+			<string>macOS PacketLogger Capture</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@ -5,7 +5,7 @@
 #     -lp /path/to/wireshark/lib -ep /path/to/wireshark/extcap/binaries
 #     -pp /path/to/wireshark/plugins -p /path/to/Info.plist
 #
-# This script attempts to build an Wireshark.app bundle for OS X, resolving
+# This script attempts to build an Wireshark.app bundle for macOS, resolving
 # dynamic libraries, etc.
 # It strips the executable and libraries if '-s' is given.
 # The Info.plist file can be found in the base wireshark directory once
@ -28,7 +28,7 @@
 # NB:
 # This originally came from Inkscape; Inkscape's configure script has an
 # "--enable-osxapp", which causes some of Inkscape's installation data
-# files to have OS X-ish paths under Contents/Resources of the bundle
+# files to have macOS-ish paths under Contents/Resources of the bundle
 # or under /Library/Application Support.  We don't have such an option;
 # we just put them in "bin", "etc", "lib", and "share" directories
 # under Contents/Resources, rather than in the "bin", "etc", "lib",
@ -97,7 +97,7 @@ fi
 help()
 {
 echo -e "
-Create an app bundle for OS X
+Create an app bundle for macOS

 USAGE
 	$0 [-s] [-l /path/to/libraries] -bp /path/to/wireshark/binaries -p /path/to/Info.plist
@ -496,11 +496,11 @@ rpathify_file () {
 		fi

 		#
-		# Show the minimum supported version of OS X
+		# Show the minimum supported version of macOS
 		# for each executable or library
 		#
 		if [[ "$filetype" = "EXECUTE" || "$filetype" = "DYLIB" ]] && [[ "$VERSION" -ge "7" ]] ; then
-			echo "Minimum OS X version for $1:"
+			echo "Minimum macOS version for $1:"
 			otool -l $1 | grep -A3 LC_VERSION_MIN_MACOSX
 		fi

--- a/test/run_and_catch_crashes
+++ b/test/run_and_catch_crashes
@ -32,7 +32,7 @@
 # It can also be done for other tests, to get more information than
 # "it crashed due to signal XXX" if the tests fail with a crash signal.
 #
-# XXX - on OS X, core dumps are in /cores/core.{PID}; would they appear
+# XXX - on macOS, core dumps are in /cores/core.{PID}; would they appear
 # elsewhere on any other UN*X?
 #
 rm -f core
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@ -468,7 +468,7 @@ wireshark_gtk_capture_suite() {
 	# WIRESHARK_QUIT_AFTER_CAPTURE needs to be set.

 	#
-	# NOTE: if, on OS X, we start using a native-Quartz toolkit,
+	# NOTE: if, on macOS, we start using a native-Quartz toolkit,
 	# this would need to change to check for WS_SYSTEM being
 	# "Darwin" and, if it is, check whether the standard output
 	# of "launchctl managername" is "Aqua".
--- a/tfshark.c
+++ b/tfshark.c
@ -367,7 +367,7 @@ main(int argc, char *argv[])
 *
 * Glibc and Solaris libc document that a leading + disables permutation
 * of options, regardless of whether POSIXLY_CORRECT is set or not; *BSD
- * and OS X don't document it, but do so anyway.
+ * and macOS don't document it, but do so anyway.
 *
 * We do *not* use a leading - because the behavior of a leading - is
 * platform-dependent.
@ -669,7 +669,7 @@ main(int argc, char *argv[])

  /*
   * To reset the options parser, set optreset to 1 on platforms that
-   * have optreset (documented in *BSD and OS X, apparently present but
+   * have optreset (documented in *BSD and macOS, apparently present but
   * not documented in Solaris - the Illumos repository seems to
   * suggest that the first Solaris getopt_long(), at least as of 2004,
   * was based on the NetBSD one, it had optreset) and set optind to 1,
--- a/tools/checkAPIs.pl
+++ b/tools/checkAPIs.pl
@ -1386,7 +1386,7 @@ sub checkAPIsCalledWithTvbGetPtr($$$)
        }
 }

-# List of possible shadow variable (Majority coming from Mac OS X..)
+# List of possible shadow variable (Majority coming from macOS..)
 my @ShadowVariable = (
        'index',
        'time',
--- a/tools/test-common.sh
+++ b/tools/test-common.sh
@ -54,11 +54,11 @@ MAX_CPU_TIME=600
 # Stop the child process if it's using more than y * 1024 bytes
 MAX_VMEM=1000000
 # Stop the child process if its stack is larger than than z * 1024 bytes
-# Windows XP:   2033
-# Windows 7:    2034
-# OS X 10.6:    8192
-# Linux 2.6.24: 8192
-# Solaris 10:   8192
+# Windows XP:    2033
+# Windows 7:     2034
+# Mac OS X 10.6: 8192
+# Linux 2.6.24:  8192
+# Solaris 10:    8192
 MAX_STACK=2033
 # Insert z times an error into the capture file (0.02 seems to be a good value to find errors)
 ERR_PROB=0.02
--- a/tshark.c
+++ b/tshark.c
@ -720,7 +720,7 @@ main(int argc, char *argv[])
 *
 * Glibc and Solaris libc document that a leading + disables permutation
 * of options, regardless of whether POSIXLY_CORRECT is set or not; *BSD
- * and OS X don't document it, but do so anyway.
+ * and macOS don't document it, but do so anyway.
 *
 * We do *not* use a leading - because the behavior of a leading - is
 * platform-dependent.
@ -1087,7 +1087,7 @@ main(int argc, char *argv[])

  /*
   * To reset the options parser, set optreset to 1 on platforms that
-   * have optreset (documented in *BSD and OS X, apparently present but
+   * have optreset (documented in *BSD and macOS, apparently present but
   * not documented in Solaris - the Illumos repository seems to
   * suggest that the first Solaris getopt_long(), at least as of 2004,
   * was based on the NetBSD one, it had optreset) and set optind to 1,
--- a/ui/commandline.c
+++ b/ui/commandline.c
@ -354,7 +354,7 @@ void commandline_other_options(int argc, char *argv[], gboolean opt_reset)

    /*
     * To reset the options parser, set optreset to 1 on platforms that
-     * have optreset (documented in *BSD and OS X, apparently present but
+     * have optreset (documented in *BSD and macOS, apparently present but
     * not documented in Solaris - the Illumos repository seems to
     * suggest that the first Solaris getopt_long(), at least as of 2004,
     * was based on the NetBSD one, it had optreset) and set optind to 1,
--- a/ui/console.c
+++ b/ui/console.c
@ -111,7 +111,7 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level,
    } else {
        /* XXX - on UN*X, should we just use g_log_default_handler()?
           We want the error messages to go to the standard output;
-           on Mac OS X, that will cause them to show up in various
+           on macOS, that will cause them to show up in various
           per-user logs accessible through Console (details depend
           on whether you're running 10.0 through 10.4 or running
           10.5 and later), and, on other UN*X desktop environments,
--- a/ui/gtk/file_dlg.c
+++ b/ui/gtk/file_dlg.c
@ -292,7 +292,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name)
     ioctls (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS in newer kernels,
     EXT2_IOC_GETFLAGS/EXT2_IOC_SETFLAGS in older kernels - non-ext2
     file systems that support those ioctls use the same values as ext2
-     does), appears to be more like the *BSD/OS X "system immutable"
+     does), appears to be more like the *BSD/macOS "system immutable"
     flag, as it can be set only by the superuser or by processes with
     CAP_LINUX_IMMUTABLE, so it sounds as if it's not intended for
     arbitrary users to set or clear. */
@ -314,8 +314,8 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name)
                                        GTK_MESSAGE_QUESTION,
                                        GTK_BUTTONS_NONE,
 #ifdef __APPLE__
-    /* Stuff in the OS X UI calls files with the "user immutable" bit
-       "locked"; pre-OS X Mac software might have had that notion and
+    /* Stuff in the macOS UI calls files with the "user immutable" bit
+       "locked"; the classic Mac OS might have had that notion and
       called it "locked". */
                                        "The file \"%s\" is locked.",
 #else /* __APPLE__ */
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@ -3195,7 +3195,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p
    menubar = main_menu_new(&accel);

 #if defined(HAVE_IGE_MAC_INTEGRATION) || defined (HAVE_GTKOSXAPPLICATION)
-    /* Mac OS X native menus are created and displayed by main_menu_new() */
+    /* macOS native menus are created and displayed by main_menu_new() */
    if(!prefs_p->gui_macosx_style) {
 #endif
    gtk_window_add_accel_group(GTK_WINDOW(top_level), accel);
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@ -2501,7 +2501,7 @@ main_menu_new(GtkAccelGroup ** table)
    }

    /* The quit item in the application menu shows up whenever ige mac
-     * integration is enabled, even if the OS X UI style in Wireshark isn't
+     * integration is enabled, even if the macOS UI style in Wireshark isn't
     * turned on. */
    quit_item = gtk_menu_item_new_with_label("Quit");
    g_signal_connect(quit_item, "activate", G_CALLBACK(file_quit_cmd_cb), NULL);
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@ -205,8 +205,8 @@ gui_prefs_show(void)

 #if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION)
 	macosx_style_cb = create_preference_check_button(main_grid, pos++,
-	    "OS X style",
-	    "Create an OS X look and feel. Checking this box will move the "
+	    "macOS style",
+	    "Create a macOS look and feel. Checking this box will move the "
 	    "menu bar to the top of the screen instead of the top of the Wireshark window. "
 	    "Requires a restart of Wireshark to take effect.",
 	    prefs.gui_macosx_style);
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@ -323,7 +323,7 @@ static int rint(double );     /* compiler template for Windows */
 static struct irect zoomrect;


-/* XXX - what about OS X? */
+/* XXX - what about macOS? */
 static char helptext[] =
    "Here's what you can do:\n"
    "\n"
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@ -480,7 +480,7 @@ static struct irect zoomrect;

 /* #define ORIGINAL_WIN32_BUTTONS 1 */

-/* XXX - what about OS X? */
+/* XXX - what about macOS? */
 /* XXX: Needs work to ensire that the columns line up properly in both Gtk2 & Gtk3  */
 /*      What is the proper way to do this ??                                        */
 static char helptext[] =
--- a/ui/gtk/webbrowser.c
+++ b/ui/gtk/webbrowser.c
@ -72,12 +72,12 @@
 * (Its Windows openURL uses ShellExecute() on non-mailto URLs (it
 * does more exotic stuff for mailto: URLs).
 *
- * Its OS X stuff uses the openURL method of an NSWorkspace (which
+ * Its macOS stuff uses the openURL method of an NSWorkspace (which
 * probably ends up in Launch Services....).)
 *
 * GTK+ has gtk_show_uri(), but that ultimately uses gvfs on UN*X,
 * so it's not appropriate for non-GNOME UN*Xes (including, but not
- * limited to, OS X), and ultimately appears to be a stubbed-out
+ * limited to, macOS), and ultimately appears to be a stubbed-out
 * routine in GLib 2.36.0, so it's not very useful for a cross-
 * platform applicatio n.
 *
@ -125,7 +125,7 @@
 /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */
 #include <shellapi.h>
 #elif defined (HAVE_OS_X_FRAMEWORKS)
-/* Mac OS X - use Launch Services to start a browser */
+/* macOS - use Launch Services to start a browser */
 #include <CoreFoundation/CoreFoundation.h>
 #include <ApplicationServices/ApplicationServices.h>
 #else
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.h
@ -58,7 +58,7 @@ class CaptureFileDialog : public QFileDialog
    //
    // On Windows Vista and later we should probably use IFileOpenDialog. On earlier
    // versions of Windows (including XP) we should use GetOpenFileName, which is
-    // what we do in ui/win32/file_dlg_win32.c. On OS X we should use NSOpenPanel. On
+    // what we do in ui/win32/file_dlg_win32.c. macOS we should use NSOpenPanel. On
    // other platforms we should fall back to QFileDialog.
    //
    // Yes, that's four implementations of the same window.
--- a/ui/qt/capture_filter_syntax_worker.cpp
+++ b/ui/qt/capture_filter_syntax_worker.cpp
@ -36,7 +36,7 @@

 // We use a global mutex to protect pcap_compile since it calls gethostbyname.
 // This probably isn't needed on Windows (where pcap_comple calls
-// EnterCriticalSection + LeaveCriticalSection) or *BSD or OS X where
+// EnterCriticalSection + LeaveCriticalSection) or *BSD or macOS where
 // gethostbyname(3) claims that it's thread safe.
 static QMutex pcap_compile_mtx_;

--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@ -334,7 +334,7 @@ void ExportObjectDialog::saveAllEntries()
    //
    // XXX - what we *really* want is something that asks the user
    // for an existing directory *but* lets them create a new
-    // directory in the process.  That's what we get on OS X,
+    // directory in the process.  That's what we get on macOS,
    // as the native dialog is used, and it supports that; does
    // that also work on Windows and with Qt's own dialog?
    //
--- a/ui/qt/geometry_state_dialog.h
+++ b/ui/qt/geometry_state_dialog.h
@ -33,7 +33,7 @@ public:
 // As discussed in change 7072, QDialogs have different minimize and "on
 // top" behaviors depending on their parents, flags, and platforms.
 //
-// W = Windows, L = Linux, X = OS X
+// W = Windows, L = Linux (and other non-macOS UN*Xes), X = macOS
 //
 // QDialog(parent)
 //
@ -57,9 +57,9 @@ public:
 //   W, L, X: Independent, minimize button.
 //
 // Additionally, maximized, parent-less dialogs can close to a black screen
-// on OS X: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12544
+// on macOS: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12544
 //
-// Pass in the parent on OS X and NULL elsewhere so that we have an
+// Pass in the parent on macOS and NULL elsewhere so that we have an
 // independent window that un-maximizes correctly.
 #ifdef Q_OS_MAC
    explicit GeometryStateDialog(QWidget *parent, Qt::WindowFlags f = 0) : QDialog(parent, f) {}
--- a/ui/qt/interface_tree_model.cpp
+++ b/ui/qt/interface_tree_model.cpp
@ -421,7 +421,7 @@ void InterfaceTreeModel::updateStatistic(unsigned int idx)
    if ( !stat_cache_ )
    {
        // Start gathering statistics using dumpcap
-        // We crash (on OS X at least) if we try to do this from ::showEvent.
+        // We crash (on macOS at least) if we try to do this from ::showEvent.
        stat_cache_ = capture_stat_start(&global_capture_opts);
    }
    if ( !stat_cache_ )
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@ -433,7 +433,7 @@ void IOGraphDialog::syncGraphSettings(QTreeWidgetItem *item)
        hint_err_ = iog->configError();
        visible = false;
        retap = false;
-        // On OS X the "not user checkable" checkbox isn't obviously disabled.
+        // On macOS the "not user checkable" checkbox isn't obviously disabled.
        // For now show it as partially checked.
        item->setCheckState(name_col_, Qt::PartiallyChecked);
        item->setFlags(item->flags() & ~Qt::ItemIsUserCheckable);
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@ -193,7 +193,7 @@ MainWelcome::MainWelcome(QWidget *parent) :
    updateRecentCaptures();

 #if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-    // This crashes with Qt 4.8.3 on OS X.
+    // This crashes with Qt 4.8.3 on macOS.
    QGraphicsBlurEffect *blur = new QGraphicsBlurEffect(welcome_ui_->childContainer);
    blur->setBlurRadius(2);
    welcome_ui_->childContainer->setGraphicsEffect(blur);
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.h
@ -64,7 +64,7 @@ private:
    QString show_in_str_;

    SplashOverlay *splash_overlay_;
-    // QListWidget doesn't activate items when the return or enter keys are pressed on OS X.
+    // QListWidget doesn't activate items when the return or enter keys are pressed on macOS.
    // We may want to subclass it at some point.