diff --git a/.ci/lnx-exclusion.list b/.ci/lnx-exclusion.list
index 398c86db0..e7e35e664 100644
--- a/.ci/lnx-exclusion.list
+++ b/.ci/lnx-exclusion.list
@@ -1,3 +1,3 @@
 setup_macos.command
 internal/c/c_compiler
-qb64_start_macos.command
+qb64_start_osx.command
diff --git a/.ci/win-exclusion.list b/.ci/win-exclusion.list
index 2a3956e3e..6d4e4f388 100644
--- a/.ci/win-exclusion.list
+++ b/.ci/win-exclusion.list
@@ -1,4 +1,4 @@
 setup_lnx.sh
-setup_macos.command
-qb64_start_macos.command
+setup_osx.command
+qb64_start_osx.command
 secure-file
diff --git a/internal/c/makeline_macos.txt b/internal/c/makeline_osx.txt
similarity index 100%
rename from internal/c/makeline_macos.txt
rename to internal/c/makeline_osx.txt
diff --git a/internal/c/purge_all_precompiled_content_macos.command b/internal/c/purge_all_precompiled_content_osx.command
similarity index 100%
rename from internal/c/purge_all_precompiled_content_macos.command
rename to internal/c/purge_all_precompiled_content_osx.command
diff --git a/qb64_start_macos.command b/qb64_start_osx.command
similarity index 100%
rename from qb64_start_macos.command
rename to qb64_start_osx.command
diff --git a/setup_macos.command b/setup_osx.command
similarity index 97%
rename from setup_macos.command
rename to setup_osx.command
index 01cb7a0bc..75f9af949 100755
--- a/setup_macos.command
+++ b/setup_osx.command
@@ -14,7 +14,7 @@ find . -type f -iname "*.a" -exec rm -f {} \;
 find . -type f -iname "*.o" -exec rm -f {} \;
 rm ./internal/temp/*
 
-if [ -z "$(which clang)" ]; then
+if [ -z "$(which clang++)" ]; then
   echo "Apple's C++ compiler not found."
   echo "Attempting to install Apple's Command Line Tools for Xcode..."
   echo "After installation is finished, run this setup script again."
diff --git a/source/qb64.bas b/source/qb64.bas
index 330445094..fd31fe7b1 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -48,7 +48,7 @@ IF _DIREXISTS("internal") = 0 THEN
     PRINT "QB64 cannot locate the 'internal' folder"
     PRINT
     PRINT "Check that QB64 has been extracted properly."
-    PRINT "For macOS, launch 'qb64_start_macos.command' or enter './qb64' in Terminal."
+    PRINT "For MacOSX, launch 'qb64_start.command' or enter './qb64' in Terminal."
     PRINT "For Linux, in the console enter './qb64'."
     DO
         _LIMIT 1
@@ -12163,7 +12163,7 @@ IF os$ = "LNX" THEN
     END IF
 
     IF INSTR(_OS$, "[MACOSX]") THEN
-        OPEN "./internal/c/makeline_macos.txt" FOR INPUT AS #150
+        OPEN "./internal/c/makeline_osx.txt" FOR INPUT AS #150
     ELSE
         OPEN "./internal/c/makeline_lnx.txt" FOR INPUT AS #150
     END IF
@@ -12230,17 +12230,17 @@ IF os$ = "LNX" THEN
     IF INSTR(_OS$, "[MACOSX]") THEN
 
         ffh = FREEFILE
-        OPEN tmpdir$ + "recompile_macos.command" FOR OUTPUT AS #ffh
+        OPEN tmpdir$ + "recompile_osx.command" FOR OUTPUT AS #ffh
         PRINT #ffh, "cd " + CHR_QUOTE + "$(dirname " + CHR_QUOTE + "$0" + CHR_QUOTE + ")" + CHR_QUOTE + CHR$(10);
         PRINT #ffh, "echo " + CHR_QUOTE + "Recompiling..." + CHR_QUOTE + CHR$(10);
         PRINT #ffh, "cd ../c" + CHR$(10);
         PRINT #ffh, a$ + CHR$(10);
         PRINT #ffh, "read -p " + CHR_QUOTE + "Press ENTER to exit..." + CHR_QUOTE + CHR$(10);
         CLOSE ffh
-        SHELL _HIDE "chmod +x " + tmpdir$ + "recompile_macos.command"
+        SHELL _HIDE "chmod +x " + tmpdir$ + "recompile_osx.command"
 
         ffh = FREEFILE
-        OPEN tmpdir$ + "debug_macos.command" FOR OUTPUT AS #ffh
+        OPEN tmpdir$ + "debug_osx.command" FOR OUTPUT AS #ffh
         PRINT #ffh, "cd " + CHR_QUOTE + "$(dirname " + CHR_QUOTE + "$0" + CHR_QUOTE + ")" + CHR_QUOTE + CHR$(10);
         PRINT #ffh, "Pause()" + CHR$(10);
         PRINT #ffh, "{" + CHR$(10);
@@ -12257,7 +12257,7 @@ IF os$ = "LNX" THEN
         PRINT #ffh, "gdb " + CHR$(34) + path.exe$ + file$ + extension$ + CHR$(34) + CHR$(10);
         PRINT #ffh, "Pause" + CHR$(10);
         CLOSE ffh
-        SHELL _HIDE "chmod +x " + tmpdir$ + "debug_macos.command"
+        SHELL _HIDE "chmod +x " + tmpdir$ + "debug_osx.command"
 
     ELSE
 
@@ -12507,7 +12507,7 @@ FUNCTION ParseCMDLineArgs$ ()
                     CHDIR "./internal/c"
 
                     IF INSTR(_OS$, "[MACOSX]") THEN
-                        SHELL _HIDE "./purge_all_precompiled_content_macos.command"
+                        SHELL _HIDE "./purge_all_precompiled_content_osx.command"
                     ELSE
                         SHELL _HIDE "./purge_all_precompiled_content_lnx.sh"
                     END IF
@@ -12555,7 +12555,7 @@ FUNCTION ParseCMDLineArgs$ ()
                             CHDIR "./internal/c"
 
                             IF INSTR(_OS$, "[MACOSX]") THEN
-                                SHELL _HIDE "./purge_all_precompiled_content_macos.command"
+                                SHELL _HIDE "./purge_all_precompiled_content_osx.command"
                             ELSE
                                 SHELL _HIDE "./purge_all_precompiled_content_lnx.sh"
                             END IF
@@ -12575,7 +12575,7 @@ FUNCTION ParseCMDLineArgs$ ()
                             CHDIR "./internal/c"
 
                             IF INSTR(_OS$, "[MACOSX]") THEN
-                                SHELL _HIDE "./purge_all_precompiled_content_macos.command"
+                                SHELL _HIDE "./purge_all_precompiled_content_osx.command"
                             ELSE
                                 SHELL _HIDE "./purge_all_precompiled_content_lnx.sh"
                             END IF