diff --git a/qtcreator.qbs b/qtcreator.qbs
index 65e07932c00..3824ef22eb5 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -5,10 +5,10 @@ Project {
     property string ide_version_minor: '7'
     property string ide_version_release: '84'
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
-    property string ide_app_path: qbs.targetOS.contains("mac") ? "" : "bin"
-    property string ide_app_target: qbs.targetOS.contains("mac") ? "Qt Creator" : "qtcreator"
+    property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
+    property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
     property string ide_library_path: {
-        if (qbs.targetOS.contains("mac"))
+        if (qbs.targetOS.contains("osx"))
             return ide_app_target + ".app/Contents/PlugIns"
         else if (qbs.targetOS.contains("windows"))
             return ide_app_path
@@ -16,23 +16,23 @@ Project {
             return "lib/qtcreator"
     }
     property string ide_plugin_path: {
-        if (qbs.targetOS.contains("mac"))
+        if (qbs.targetOS.contains("osx"))
             return ide_library_path
         else if (qbs.targetOS.contains("windows"))
             return "lib/qtcreator/plugins"
         else
             return ide_library_path + "/plugins"
     }
-    property string ide_data_path: qbs.targetOS.contains("mac")
+    property string ide_data_path: qbs.targetOS.contains("osx")
             ? ide_app_target + ".app/Contents/Resources"
             : "share/qtcreator"
-    property string ide_libexec_path: qbs.targetOS.contains("mac")
+    property string ide_libexec_path: qbs.targetOS.contains("osx")
             ? ide_data_path
             : ide_app_path
-    property string ide_doc_path: qbs.targetOS.contains("mac")
+    property string ide_doc_path: qbs.targetOS.contains("osx")
             ? ide_data_path + "/doc"
             : "share/doc/qtcreator"
-    property string ide_bin_path: qbs.targetOS.contains("mac")
+    property string ide_bin_path: qbs.targetOS.contains("osx")
             ? ide_app_target + ".app/Contents/MacOS"
             : ide_app_path
     moduleSearchPaths: "qbs"
diff --git a/src/app/app.qbs b/src/app/app.qbs
index c92d864d9f2..824999c1162 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -5,7 +5,7 @@ Application {
     name: project.ide_app_target
     consoleApplication: qbs.debugInformation
 
-    cpp.rpaths: qbs.targetOS.contains("mac") ? ["@executable_path/.."]
+    cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
                                              : ["$ORIGIN/../lib/qtcreator"]
     cpp.defines: Defaults.defines(qbs)
     cpp.linkerFlags: {
@@ -40,7 +40,7 @@ Application {
 
     Group {
         name: "qtcreator.sh"
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
         files: "../../bin/qtcreator.sh"
         qbs.install: true
         qbs.installDir: "bin"
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 7bc97fdb80e..35d2b206667 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -14,7 +14,7 @@ DynamicLibrary {
             return ["-Wl,-s"]
     }
     cpp.installNamePrefix: "@rpath/PlugIns/"
-    cpp.rpaths: qbs.targetOS.contains("mac")
+    cpp.rpaths: qbs.targetOS.contains("osx")
             ? ["@loader_path/..", "@executable_path/.."]
             : ["$ORIGIN", "$ORIGIN/.."]
     cpp.includePaths: [ ".", ".." ]
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 111c96add99..924e8918d7d 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -58,7 +58,7 @@ QtcLibrary {
             result.push("advapi32", "user32")
         else if (qbs.targetOS.contains("linux"))
             result.push("rt", "dl");
-        else if (qbs.targetOS.contains("mac"))
+        else if (qbs.targetOS.contains("osx"))
             result.push("dl");
         else if (qbs.targetOS.contains("unix"))
             result.push("rt");
@@ -82,7 +82,7 @@ QtcLibrary {
                             "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
                             "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
                             "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
-            if (qbs.targetOS.contains("mac"))
+            if (qbs.targetOS.contains("osx"))
                 result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
                             "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
                             "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 952664d4c73..61f3bba82d4 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -15,7 +15,7 @@ QtcLibrary {
         ]
     }
     Properties {
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
         cpp.dynamicLibraries: ["X11"]
     }
 
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 21530f63141..fb839a995ee 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -31,7 +31,7 @@ Product {
 
     cpp.defines: Defaults.defines(qbs).concat([name.toUpperCase() + "_LIBRARY"])
     cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/"
-    cpp.rpaths: qbs.targetOS.contains("mac") ? ["@loader_path/../..", "@executable_path/.."]
+    cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."]
                                       : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
     cpp.linkerFlags: {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 4893f59ef2d..bc8934029fb 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -6,7 +6,7 @@ QtcPlugin {
     name: "ClearCase"
 //    provider: "AudioCodes"
 
-    condition: !qbs.targetOS.contains("mac")
+    condition: !qbs.targetOS.contains("osx")
 
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 84a66d5bde8..c7675f50f03 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -31,7 +31,7 @@ QtcPlugin {
         ]
     }
 
-    cpp.frameworks: qbs.targetOS.contains("mac") ? ["AppKit"] : undefined
+    cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined
 
     files: [
         "basefilewizard.cpp",
@@ -241,7 +241,7 @@ QtcPlugin {
 
     Group {
         name: "ProgressManager_mac"
-        condition: qbs.targetOS.contains("mac")
+        condition: qbs.targetOS.contains("osx")
         files: [
             "macfullscreen.h",
             "macfullscreen.mm",
@@ -251,7 +251,7 @@ QtcPlugin {
 
     Group {
         name: "ProgressManager_x11"
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
         files: [
             "progressmanager/progressmanager_x11.cpp",
         ]
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index bafa5e08280..e4aabbb7f89 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -287,7 +287,7 @@ QtcPlugin {
 
     Group {
         name: "LLDBOptions"
-        condition: qbs.targetOS.contains("mac")
+        condition: qbs.targetOS.contains("osx")
         files: [
             "lldblib/lldboptionspage.cpp",
             "lldblib/lldboptionspage.h",
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index 3dcef19f45a..e9510a4ee80 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -9,7 +9,7 @@ QtcTool {
     Depends { name: "app_version_header" }
 
     cpp.includePaths: "../../libs"
-    cpp.defines: base.concat([qbs.targetOS.contains("mac")
+    cpp.defines: base.concat([qbs.targetOS.contains("osx")
             ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"'])
 
     files: [