diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index 63b31434f218792e72712e9aa624b11e1d444b13..c79b73c5bf631756b30f76fb9fb80a3ce11c87ce 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -300,7 +300,7 @@ void CMakeRunPage::initWidgets()
         fl->addRow(new QLabel(text, this));
         // Show a field for the user to enter
         m_cmakeExecutable = new Utils::PathChooser(this);
-        m_cmakeExecutable->setExpectedKind(Utils::PathChooser::Command);
+        m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand);
         fl->addRow("CMake Executable", m_cmakeExecutable);
     }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index aaffb08bd48408d12a59d7eeb5fbcf3b2e051d5c..bb84b5242d8d4b5c904a9f4018abed827f0f36dd 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -280,7 +280,7 @@ QWidget *CMakeSettingsPage::createPage(QWidget *parent)
     QWidget *outerWidget = new QWidget(parent);
     QFormLayout *formLayout = new QFormLayout(outerWidget);
     m_pathchooser = new Utils::PathChooser;
-    m_pathchooser->setExpectedKind(Utils::PathChooser::Command);
+    m_pathchooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
     formLayout->addRow(tr("Executable:"), m_pathchooser);
     formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
     m_pathchooser->setPath(cmakeExecutable());
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index d4106f7f6dd1b4dd5919cf028c8aedbae91f4a91..79ff660e50db658f289859548d0c1d614502d2cf 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -47,7 +47,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
     QWidget(parent)
 {
     m_ui.setupUi(this);
-    m_ui.commandPathChooser->setExpectedKind(PathChooser::Command);
+    m_ui.commandPathChooser->setExpectedKind(PathChooser::ExistingCommand);
     m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
 }
 
diff --git a/src/plugins/debugger/gdb/gdbchooserwidget.cpp b/src/plugins/debugger/gdb/gdbchooserwidget.cpp
index c45f6f23e6931b305d9871442826dee8bc343788..accaf8aee871c3f4cc5d964183082fc12533d83c 100644
--- a/src/plugins/debugger/gdb/gdbchooserwidget.cpp
+++ b/src/plugins/debugger/gdb/gdbchooserwidget.cpp
@@ -521,7 +521,7 @@ BinaryToolChainDialog::BinaryToolChainDialog(QWidget *parent) :
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Select binary and toolchains"));
 
-    m_pathChooser->setExpectedKind(Utils::PathChooser::Command);
+    m_pathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_pathChooser->setPromptDialogTitle(tr("Gdb binary"));
     connect(m_pathChooser, SIGNAL(validChanged()), this, SLOT(slotValidChanged()));
     m_mainLayout->addRow(tr("Path:"), m_pathChooser);
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index 757ebb78442d7055efa71b248a66c80c453e3731..38ce87c1e964bb213546e4cf3630e98c9ab8d54f 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -44,7 +44,7 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
         QWidget(parent)
 {
     m_ui.setupUi(this);
-    m_ui.commandChooser->setExpectedKind(Utils::PathChooser::Command);
+    m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_ui.commandChooser->setPromptDialogTitle(tr("Mercurial Command"));
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 64cf746b6728c45334c4a68f33f6e7a2b9a0e167..5b63607acdb4c3d245c1a82902eab3202836f4bf 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -161,7 +161,7 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
     connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox()));
 
     Utils::PathChooser *qmlViewer = new Utils::PathChooser;
-    qmlViewer->setExpectedKind(Utils::PathChooser::Command);
+    qmlViewer->setExpectedKind(Utils::PathChooser::ExistingCommand);
     qmlViewer->setPath(m_qmlViewerCustomPath);
 
     connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onViewerChanged()));
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 0583fe3c472ffbecfeec401ef99c04a0675cf7b6..4ddedd4436bdcd5b19f01ad1286bde8e80058a51 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -47,7 +47,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
     QWidget(parent)
 {
     m_ui.setupUi(this);
-    m_ui.pathChooser->setExpectedKind(PathChooser::Command);
+    m_ui.pathChooser->setExpectedKind(PathChooser::ExistingCommand);
     m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
 }
 
diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp
index c382170b3148308048abe8271e753978d9aa2474..b842f96c90a95ed0d7046204e0b48af3c5a120a9 100644
--- a/src/plugins/vcsbase/commonsettingspage.cpp
+++ b/src/plugins/vcsbase/commonsettingspage.cpp
@@ -50,10 +50,10 @@ CommonSettingsWidget::CommonSettingsWidget(QWidget *parent) :
     m_ui(new Ui::CommonSettingsPage)
 {
     m_ui->setupUi(this);
-    m_ui->submitMessageCheckScriptChooser->setExpectedKind(Utils::PathChooser::Command);
+    m_ui->submitMessageCheckScriptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_ui->nickNameFieldsFileChooser->setExpectedKind(Utils::PathChooser::File);
     m_ui->nickNameMailMapChooser->setExpectedKind(Utils::PathChooser::File);
-    m_ui->sshPromptChooser->setExpectedKind(Utils::PathChooser::Command);
+    m_ui->sshPromptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
 }
 
 CommonSettingsWidget::~CommonSettingsWidget()