diff --git a/README-CONAN.md b/README-CONAN.md
index 2bc7953e..c720491e 100644
--- a/README-CONAN.md
+++ b/README-CONAN.md
@@ -572,7 +572,7 @@ You must tell CMake to link Adobe's library:
 ```bash
 $ cmake .. -DEXIV2_ENABLE_EXTERNAL_XMP=On # -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release
 ```
-**MacOS-X** users should use the cmake _**Xcode**_ Generator
+**macOS** users should use the cmake _**Xcode**_ Generator
 
 ```bash
 $ cmake .. -DEXIV2_ENABLE_EXTERNAL_XMP=On -G Xcode
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index b5ace411..a09b3ec7 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -9,7 +9,7 @@ set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) "/.git/" "/build/" "\
 if ( MSVC )
     set(CPACK_GENERATOR ZIP)  # use .zip - less likely to damage bin/exiv2.dll permissions
 else()
-    set(CPACK_GENERATOR TGZ)  # MinGW/Cygwin/Linux/MacOS-X etc use .tar.gz
+    set(CPACK_GENERATOR TGZ)  # MinGW/Cygwin/Linux/macOS etc use .tar.gz
 endif()
 
 set (BS "") # Bit Size
diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1
index 19d3bc76..4bf17abf 100644
--- a/man/man1/exiv2.1
+++ b/man/man1/exiv2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "March 22, 2020"
+.TH EXIV2 1 "March 28, 2020"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -196,7 +196,7 @@ Show the program version and exit.
 When \fB\-V\fP is combined with \fB\-v\fP (Verbose version), build information
 is printed to standard output along with a list of shared libraries which
 have been loaded into memory. Verbose version is supported on Windows
-(MSVC, Cygwin and MinGW builds), MacOSX and Linux and is provided
+(MSVC, Cygwin and MinGW builds), macOS and Linux and is provided
 for test and debugging.
 .TP
 .B \-v
diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt
index e7aa94d8..58275cb5 100644
--- a/releasenotes/Darwin/ReadMe.txt
+++ b/releasenotes/Darwin/ReadMe.txt
@@ -1,5 +1,5 @@
-MacOS-X (Darwin) Exiv2 v0.27.2 Bundle
------------------------------------------
+macOS (Darwin) Exiv2 v0.27.2 Bundle
+-----------------------------------
 
 Structure of the bundle
 -----------------------
diff --git a/src/actions.cpp b/src/actions.cpp
index 826d9e8b..8350fd4c 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2023,7 +2023,7 @@ namespace {
 #if defined(_MSC_VER) || defined(__MINGW__)
  static CRITICAL_SECTION cs;
 #else
- /* Unix/Linux/Cygwin/MacOSX */
+ /* Unix/Linux/Cygwin/macOS */
  #include <pthread.h>
  /* This is the critical section object (statically allocated). */
  #if defined(__APPLE__)
diff --git a/src/basicio.cpp b/src/basicio.cpp
index fe86559b..faf7fe9a 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -279,7 +279,7 @@ namespace Exiv2 {
     {
 #if defined(__APPLE__)
 # if defined(EXV_UNICODE_PATH)
-#  error No xattr API for MacOS X with unicode support
+#  error No xattr API for macOS with unicode support
 # endif
         ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0);
         if (namebufSize < 0) {
diff --git a/test/build-test.py b/test/build-test.py
index 1a9ef197..970a9738 100755
--- a/test/build-test.py
+++ b/test/build-test.py
@@ -81,7 +81,7 @@ def apple(dict):
              # , 'libstdc++.6.dylib' # I suspect this is only with GCC (Xcode4 and earlier)
              ] ;
 
-    # which version of MacOS-X ?
+    # which version of macOS ?
     os_major=int(os.uname()[2].split('.')[0])
     os_minor=int(os.uname()[2].split('.')[1])
     NC=13;ML=12;LION=11;SL=10;LEO=9;
diff --git a/test/functions.source b/test/functions.source
index 3611c91a..40eb08dd 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -420,7 +420,7 @@ copyVideoFiles ()
 checkSum()
 {
     # cygwin checksum: http://esrg.sourceforge.net/utils_win_up/md5sum/
-    # macosx - built/installed coreutils 8.25 http://ftp.gnu.org/gnu/coreutils/
+    # macos - built/installed coreutils 8.25 http://ftp.gnu.org/gnu/coreutils/
     platform=$(uname)
     if [ "$platform" == 'NetBSD' -o "$platform" == 'FreeBSD' ]; then
       md5 -q $1