diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index e5055dafb02..e96d331eb09 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -1139,11 +1139,11 @@ FilePath FilePath::withNewPath(const QString &newPath) const
     Example usage:
     \code
         binary = FilePath::fromUrl("docker://123/./make);
-        fullPath = binary.searchOnDevice();
+        fullPath = binary.searchInDirectories(binary.deviceEnvironment().path());
         assert(fullPath == FilePath::fromUrl("docker://123/usr/bin/make"))
     \endcode
 */
-FilePath FilePath::searchOnDevice(const FilePaths &dirs) const
+FilePath FilePath::searchInDirectories(const FilePaths &dirs) const
 {
     if (needsDevice()) {
         QTC_ASSERT(s_deviceHooks.searchInPath, return {});
diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h
index b68609e31ce..579a2dae5eb 100644
--- a/src/libs/utils/filepath.h
+++ b/src/libs/utils/filepath.h
@@ -168,7 +168,7 @@ public:
     static FilePath fromUrl(const QUrl &url);
     QUrl toUrl() const;
 
-    FilePath searchOnDevice(const QList<FilePath> &dirs) const;
+    FilePath searchInDirectories(const QList<FilePath> &dirs) const;
     Environment deviceEnvironment() const;
 
     static QString formatFilePaths(const QList<FilePath> &files, const QString &separator);
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 0d095c77930..e2dadc4c059 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -226,7 +226,7 @@ FilePath PathChooserPrivate::expandedPath(const QString &input) const
     case PathChooser::ExistingCommand: {
         FilePaths searchPaths = env.path();
         searchPaths.append(m_baseDirectory);
-        const FilePath expanded = path.searchOnDevice(searchPaths);
+        const FilePath expanded = path.searchInDirectories(searchPaths);
         return expanded.isEmpty() ? path : expanded;
     }
     case PathChooser::Any:
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index 128c4a7ee3d..37c83ae3528 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -188,7 +188,7 @@ void CMakeToolManager::autoDetectCMakeForDevice(const FilePath &deviceRoot,
     const FilePaths candidates = {deviceRoot.withNewPath("cmake")};
     const Environment env = deviceRoot.deviceEnvironment();
     for (const FilePath &candidate : candidates) {
-        const FilePath cmake = candidate.searchOnDevice(env.path());
+        const FilePath cmake = candidate.searchInDirectories(env.path());
         if (!cmake.isEmpty()) {
             registerCMakeByPath(cmake, detectionSource);
             messages.append(tr("Found \"%1\"").arg(cmake.toUserOutput()));
diff --git a/src/plugins/webassembly/webassemblyemsdk.cpp b/src/plugins/webassembly/webassemblyemsdk.cpp
index 1fd109514f0..71f8f2d9f44 100644
--- a/src/plugins/webassembly/webassemblyemsdk.cpp
+++ b/src/plugins/webassembly/webassemblyemsdk.cpp
@@ -107,7 +107,7 @@ QVersionNumber WebAssemblyEmSdk::version(const FilePath &sdkRoot)
         Environment env;
         WebAssemblyEmSdk::addToEnvironment(sdkRoot, env);
         QLatin1String scriptFile{sdkRoot.osType() == OsType::OsTypeWindows ? "emcc.bat" : "emcc"};
-        FilePath script = sdkRoot.withNewPath(scriptFile).searchOnDevice(env.path());
+        FilePath script = sdkRoot.withNewPath(scriptFile).searchInDirectories(env.path());
         const CommandLine command(script, {"-dumpversion"});
         QtcProcess emcc;
         emcc.setCommand(command);
diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp
index 816c745ca02..ea87c8b774d 100644
--- a/src/plugins/webassembly/webassemblytoolchain.cpp
+++ b/src/plugins/webassembly/webassemblytoolchain.cpp
@@ -186,7 +186,7 @@ QList<ToolChain *> WebAssemblyToolChainFactory::autoDetect(
         const bool cLanguage = languageId == ProjectExplorer::Constants::C_LANGUAGE_ID;
         const QString script = QLatin1String(cLanguage ? "emcc" : "em++")
                 + QLatin1String(sdk.osType() == OsTypeWindows ? ".bat" : "");
-        const FilePath scriptFile = sdk.withNewPath(script).searchOnDevice(env.path());
+        const FilePath scriptFile = sdk.withNewPath(script).searchInDirectories(env.path());
         toolChain->setCompilerCommand(scriptFile);
 
         const QString displayName = WebAssemblyToolChain::tr("Emscripten Compiler %1 for %2")