diff --git a/README.md b/README.md
index 4abfd20c7..039dc9efe 100644
--- a/README.md
+++ b/README.md
@@ -570,10 +570,10 @@ Using this option, all SIMD instructions are exclusively accessed via VOLK, whic
 More details can be found in our tutorial about [GNSS-SDR configuration options at building time](https://gnss-sdr.org/docs/tutorials/using-git/ "Configuration options at building time").
 
 
-<a name="macosx">macOS and Mac OS X</a>
+<a name="macosx">macOS</a>
 ---------
 
-GNSS-SDR can be built on MacOS or Mac OS X, starting from 10.9 (Mavericks) and including 10.15 (Catalina). If you still have not installed [Xcode](https://developer.apple.com/xcode/ "Xcode"), do it now from the App Store (it's free). You will also need the Xcode Command Line Tools. Launch the Terminal, found in /Applications/Utilities/, and type:
+GNSS-SDR can be built on macOS (or the former Mac OS X), starting from 10.9 (Mavericks) and including 10.15 (Catalina). If you still have not installed [Xcode](https://developer.apple.com/xcode/ "Xcode"), do it now from the App Store (it's free). You will also need the Xcode Command Line Tools. Launch the Terminal, found in /Applications/Utilities/, and type:
 
 ~~~~~~
 $ xcode-select --install
@@ -597,11 +597,9 @@ In a terminal, type:
 $ sudo port selfupdate
 $ sudo port upgrade outdated
 $ sudo port install armadillo cmake gnuradio gnutls lapack libad9361-iio libiio \
-    matio pkgconfig protobuf3-cpp pugixml
-$ sudo port install google-glog +gflags
+    matio pkgconfig protobuf3-cpp pugixml google-glog +gflags
+$ sudo port install py37-mako py37-six
 $ sudo port install doxygen +docs
-$ sudo port install py37-mako
-$ sudo port install py37-six
 ~~~~~~
 
 You also might need to activate a Python installation. The list of installed versions can be retrieved with:
diff --git a/docs/changelog b/docs/changelog
index 760a414e3..57cbf57a3 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -268,7 +268,7 @@ This release has several improvements in different dimensions, addition of new f
 - Improved SDK for cross-compilation in embedded devices. Documented in https://gnss-sdr.org/docs/tutorials/cross-compiling/
 - Improved control over minimum required versions for core dependencies.
 - The software builds with C++11, C++14 and C++17 standards.
-- The software can now be built using GCC >= 4.7.2 or LLVM/Clang >= 3.4.0 compilers on GNU/Linux, and with Clang/AppleClang on MacOS.
+- The software can now be built using GCC >= 4.7.2 or LLVM/Clang >= 3.4.0 compilers on GNU/Linux, and with Clang/AppleClang on macOS.
 - The Ninja build system can be used in replacement of make.
 - The volk_gnsssdr library can be built using Python 2.7+ or Python 3.6+.
 - The volk_gnsssdr library is now ready for AArch64 NEON instructions.
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index e05d035c4..d7d0d170e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -644,7 +644,7 @@ if(ENABLE_SYSTEM_TESTING)
         string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}")
     endif()
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        set(HOST_SYSTEM "MacOS")
+        set(HOST_SYSTEM "macOS")
     endif()
     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
 
diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index ee8c5a957..34718dd6c 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -67,7 +67,7 @@ DEFINE_bool(show_plots, true, "Show plots on screen. Disable for non-interactive
 #include <io.h>              // for _access(), _mktemp()
 #define GP_MAX_TMP_FILES 27  // 27 temporary files it's Microsoft restriction
 #elif defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
-// all UNIX-like OSs (Linux, *BSD, MacOSX, Solaris, ...)
+// all UNIX-like OSs (Linux, *BSD, macOS, Solaris, ...)
 #include <unistd.h>  // for access(), mkstemp()
 #define GP_MAX_TMP_FILES 1024
 #else
diff --git a/src/utils/rinex2assist/README.md b/src/utils/rinex2assist/README.md
index 4708a3f87..965c549f9 100644
--- a/src/utils/rinex2assist/README.md
+++ b/src/utils/rinex2assist/README.md
@@ -22,7 +22,7 @@ The building requires two extra dependencies: the Boost Iostreams library and th
      - In Fedora / CentOS: `sudo yum install boost-iostreams`
      - In OpenSUSE: `sudo zypper install libboost_iostreams-devel`
      - In Arch Linux: included in `boost-libs` package.
-     - In MacOS: included in Macports / Homebrew `boost` package.
+     - In macOS: included in Macports / Homebrew `boost` package.
   * The program `uncompress` is available by default in most UNIX and GNU/Linux systems.
      - In Fedora / CentOS: `sudo yum install ncompress`
      - In OpenSUSE: `sudo zypper install ncompress`