diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index 94684c1ca6d..cecfdf5eb5c 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -286,7 +286,7 @@ void LanguageClientManager::applySettings()
 
     for (BaseSettings *setting : restarts) {
         QList<TextEditor::TextDocument *> documents;
-        const QList<Client *> currentClients = clientForSetting(setting);
+        const QList<Client *> currentClients = clientsForSetting(setting);
         for (Client *client : currentClients) {
             documents << managerInstance->m_clientForDocument.keys(client);
             shutdownClient(client);
@@ -367,7 +367,7 @@ void LanguageClientManager::enableClientSettings(const QString &settingsId)
     managerInstance->applySettings();
 }
 
-QList<Client *> LanguageClientManager::clientForSetting(const BaseSettings *setting)
+QList<Client *> LanguageClientManager::clientsForSetting(const BaseSettings *setting)
 {
     QTC_ASSERT(managerInstance, return {});
     auto instance = managerInstance;
@@ -506,7 +506,7 @@ void LanguageClientManager::documentOpened(Core::IDocument *document)
     for (BaseSettings *setting : settings) {
         if (setting->isValid() && setting->m_enabled
             && setting->m_languageFilter.isSupported(document)) {
-            QList<Client *> clients = clientForSetting(setting);
+            QList<Client *> clients = clientsForSetting(setting);
             if (setting->m_startBehavior == BaseSettings::RequiresProject) {
                 const Utils::FilePath &filePath = document->filePath();
                 for (ProjectExplorer::Project *project :
@@ -569,7 +569,7 @@ void LanguageClientManager::updateProject(ProjectExplorer::Project *project)
         if (setting->isValid()
             && setting->m_enabled
             && setting->m_startBehavior == BaseSettings::RequiresProject) {
-            if (Utils::findOrDefault(clientForSetting(setting),
+            if (Utils::findOrDefault(clientsForSetting(setting),
                                      [project](const QPointer<Client> &client) {
                                          return client->project() == project;
                                      })
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index 77f8446e38c..5aa675c6c36 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -81,7 +81,7 @@ public:
     static QList<BaseSettings *> currentSettings();
     static void registerClientSettings(BaseSettings *settings);
     static void enableClientSettings(const QString &settingsId);
-    static QList<Client *> clientForSetting(const BaseSettings *setting);
+    static QList<Client *> clientsForSetting(const BaseSettings *setting);
     static const BaseSettings *settingForClient(Client *setting);
     static Client *clientForDocument(TextEditor::TextDocument *document);
     static Client *clientForFilePath(const Utils::FilePath &filePath);
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 09fa2d7a1cf..a709335abf6 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -326,7 +326,7 @@ void LanguageClientSettingsPage::apply()
     LanguageClientManager::applySettings();
 
     for (BaseSettings *setting : m_model.removed()) {
-        for (Client *client : LanguageClientManager::clientForSetting(setting))
+        for (Client *client : LanguageClientManager::clientsForSetting(setting))
             LanguageClientManager::shutdownClient(client);
     }
 
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index 593dbc080bb..153f7e03bf7 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -442,7 +442,7 @@ bool PyLSSettings::applyFromSettingsWidget(QWidget *widget)
     if (m_configuration != pylswidget->configuration()) {
         m_configuration = pylswidget->configuration();
         if (!changed) { // if only the settings configuration changed just send an update
-            const QList<Client *> clients = LanguageClientManager::clientForSetting(this);
+            const QList<Client *> clients = LanguageClientManager::clientsForSetting(this);
             for (Client *client : clients)
                 client->updateConfiguration(configuration());
         }
@@ -540,7 +540,7 @@ static Client *registerLanguageServer(const FilePath &python)
     settings->m_name = PyLSConfigureAssistant::tr("Python Language Server (%1)")
                            .arg(pythonName(python));
     LanguageClientManager::registerClientSettings(settings);
-    Client *client = LanguageClientManager::clientForSetting(settings).value(0);
+    Client *client = LanguageClientManager::clientsForSetting(settings).value(0);
     PyLSConfigureAssistant::updateEditorInfoBars(python, client);
     return client;
 }
@@ -663,7 +663,7 @@ static void enablePythonLanguageServer(const FilePath &python,
     if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) {
         LanguageClientManager::enableClientSettings(setting->m_id);
         if (const StdIOSettings *setting = PyLSConfigureAssistant::languageServerForPython(python)) {
-            if (Client *client = LanguageClientManager::clientForSetting(setting).value(0)) {
+            if (Client *client = LanguageClientManager::clientsForSetting(setting).value(0)) {
                 LanguageClientManager::openDocumentWithClient(document, client);
                 PyLSConfigureAssistant::updateEditorInfoBars(python, client);
             }
@@ -719,7 +719,7 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
         return;
     if (state.state == PythonLanguageServerState::AlreadyConfigured) {
         if (const StdIOSettings *setting = languageServerForPython(python)) {
-            if (Client *client = LanguageClientManager::clientForSetting(setting).value(0))
+            if (Client *client = LanguageClientManager::clientsForSetting(setting).value(0))
                 LanguageClientManager::openDocumentWithClient(document, client);
         }
         return;