diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 2b00bb3ba4e..3b4a83095ca 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -153,8 +153,6 @@ public:
 
     // Deprecated. Use filePath().toString() or better suitable conversions.
     QString path() const { return filePath().toString(); }
-    // Deprecated. Use filePath()
-    FilePath fileName() const { return filePath(); }
 
     // this sets the placeHolderText to defaultValue and enables to use this as
     // input value during validation if the real value is empty
@@ -179,8 +177,6 @@ signals:
 
 public slots:
     void setPath(const QString &);
-    // Deprecated: Use setFilePath()
-    void setFileName(const FilePath &path) { setFilePath(path); }
     void setFilePath(const FilePath &);
 
 private:
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index fd25d12ae1d..51b837af0f7 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -600,7 +600,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
     FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
     if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists())
         currentOpenSslPath = sdkPath.pathAppended("android_openssl");
-    m_ui.openSslPathChooser->setFileName(currentOpenSslPath);
+    m_ui.openSslPathChooser->setFilePath(currentOpenSslPath);
     // Package reload will trigger validateSdk.
     m_sdkManager.reloadPackages();
 }
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index 8aae51fa590..82f9cad8863 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -64,7 +64,7 @@ CvsSettingsPageWidget::CvsSettingsPageWidget(const std::function<void()> &onAppl
     m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
 
     const VcsBaseClientSettings &s = *settings;
-    m_ui.commandPathChooser->setFileName(s.binaryPath());
+    m_ui.commandPathChooser->setFilePath(s.binaryPath());
     m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey));
     m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey));
     m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey));
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
index 2bf9b22648f..a1ba99d360c 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
@@ -57,7 +57,7 @@ void ToolItemSettings::load(ToolTreeItem *item)
         ui->mesonNameLineEdit->setDisabled(item->isAutoDetected());
         ui->mesonNameLineEdit->setText(item->name());
         ui->mesonPathChooser->setDisabled(item->isAutoDetected());
-        ui->mesonPathChooser->setFileName(item->executable());
+        ui->mesonPathChooser->setFilePath(item->executable());
         m_currentId = item->id();
     } else {
         m_currentId = Utils::nullopt;
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
index 86c9d53b41c..0c6a8a46f78 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
@@ -80,7 +80,7 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath,
 {
     m_ui->setupUi(this);
 
-    m_ui->exportPath->setFileName(exportPath);
+    m_ui->exportPath->setFilePath(exportPath);
     m_ui->exportPath->setPromptDialogTitle(tr("Choose Export Path"));
     m_ui->exportPath->lineEdit()->setReadOnly(true);
     m_ui->exportPath->addButton(tr("Open"), this, [this]() {
@@ -153,7 +153,7 @@ void AssetExportDialog::onExport()
     TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT);
     m_exportLogs->clear();
 
-    m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->fileName(),
+    m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->filePath(),
                               m_exportAssetsCheck->isChecked(),
                               m_perComponentExportCheck->isChecked());
 }
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index e714dfcde9a..2ee4aaad5c4 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -69,7 +69,7 @@ SubversionSettingsPageWidget::SubversionSettingsPageWidget(const std::function<v
     m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
 
     SubversionSettings &s = *m_settings;
-    m_ui.pathChooser->setFileName(s.binaryPath());
+    m_ui.pathChooser->setFilePath(s.binaryPath());
     m_ui.usernameLineEdit->setText(s.stringValue(SubversionSettings::userKey));
     m_ui.passwordLineEdit->setText(s.stringValue(SubversionSettings::passwordKey));
     m_ui.userGroupBox->setChecked(s.boolValue(SubversionSettings::useAuthenticationKey));