diff --git a/configure.ac b/configure.ac
index 4afa4d4b78..dcd78f64bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,13 +180,13 @@ want_ifconfig=no
 dnl Make some notes about which OS we're compiling for, as the lxc and qemu
 dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter
 dnl are also linux specific.  The "network" and storage_fs drivers are known
-dnl to not work on MacOS X presently, so we also make a note if compiling
+dnl to not work on macOS presently, so we also make a note if compiling
 dnl for that
 
-with_linux=no with_osx=no with_freebsd=no with_win=no with_cygwin=no
+with_linux=no with_macos=no with_freebsd=no with_win=no with_cygwin=no
 case $host in
   *-*-linux*) with_linux=yes ;;
-  *-*-darwin*) with_osx=yes ;;
+  *-*-darwin*) with_macos=yes ;;
   *-*-freebsd*) with_freebsd=yes ;;
   *-*-mingw* | *-*-msvc* ) with_win=yes ;;
   *-*-cygwin*) with_cygwin=yes ;;
@@ -627,9 +627,9 @@ if test "$with_libvirtd" = "no"; then
   with_storage_vstorage=no
 fi
 
-dnl storage-fs does not work on MacOS X
+dnl storage-fs does not work on macOS
 
-if test "$with_osx" = "yes"; then
+if test "$with_macos" = "yes"; then
   with_storage_fs=no
 fi
 
diff --git a/m4/virt-driver-network.m4 b/m4/virt-driver-network.m4
index 1fc9b204c6..b98ce07c9c 100644
--- a/m4/virt-driver-network.m4
+++ b/m4/virt-driver-network.m4
@@ -27,9 +27,9 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_NETWORK], [
   AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LXC])
 
   dnl there's no use compiling the network driver without the libvirt
-  dnl daemon, nor compiling it for MacOS X, where it breaks the compile
+  dnl daemon, nor compiling it for macOS, where it breaks the compile
 
-  if test "$with_libvirtd" = "no" || test "$with_osx" = "yes"; then
+  if test "$with_libvirtd" = "no" || test "$with_macos" = "yes"; then
     with_network=no
   fi
 
diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4
index 556599f1f3..a1d05bbd7f 100644
--- a/m4/virt-driver-qemu.m4
+++ b/m4/virt-driver-qemu.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [
   fi
   AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"])
 
-  if test $with_freebsd = yes || test $with_osx = yes; then
+  if test $with_freebsd = yes || test $with_macos = yes; then
     default_qemu_user=root
     default_qemu_group=wheel
   else
diff --git a/tools/virsh.pod b/tools/virsh.pod
index b7ceba8d03..bb52de3eed 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -2389,8 +2389,8 @@ See L<virkeycode-atset3(7)>
 
 =item B<os_x>
 
-The numeric values are those defined by the OS-X keyboard input
-subsystem. The symbolic names match the corresponding OS-X key
+The numeric values are those defined by the macOS keyboard input
+subsystem. The symbolic names match the corresponding macOS key
 constant macro names
 
 See L<virkeycode-osx(7)> and L<virkeyname-osx(7)>